From 2f9d6faec8fef0db777ebdb75038ac8a754fc732 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Wed, 30 May 2018 08:17:44 +0200 Subject: [PATCH 01/22] Add Bazel version check Bazel version check was implemented on master, and stable branches, that were already migrated to Bazel, missied that feature. We need the version check, to add bazel caching feature, that was only added in very recent Bazel versions. This is done in follow-up change. Change-Id: I901caa6f9c037be29d377dd9f1c451d57ecc252f --- WORKSPACE | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/WORKSPACE b/WORKSPACE index 591487c198..497ee8758d 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -4,6 +4,13 @@ load("//tools/bzl:maven_jar.bzl", "maven_jar", "GERRIT", "MAVEN_LOCAL") load("//lib/codemirror:cm.bzl", "CM_VERSION", "DIFF_MATCH_PATCH_VERSION") load("//plugins:external_plugin_deps.bzl", "external_plugin_deps") +http_archive( + name = "bazel_skylib", + sha256 = "bbccf674aa441c266df9894182d80de104cabd19be98be002f6d478aaa31574d", + strip_prefix = "bazel-skylib-2169ae1c374aab4a09aa90e65efe1a3aad4e279b", + urls = ["https://github.com/bazelbuild/bazel-skylib/archive/2169ae1c374aab4a09aa90e65efe1a3aad4e279b.tar.gz"], +) + http_archive( name = "io_bazel_rules_closure", sha256 = "6691c58a2cd30a86776dd9bb34898b041e37136f2dc7e24cadaeaf599c95c657", @@ -20,6 +27,10 @@ http_file( url = "https://raw.githubusercontent.com/google/closure-compiler/775609aad61e14aef289ebec4bfc09ad88877f9e/contrib/externs/polymer-1.0.js", ) +load("@bazel_skylib//:lib.bzl", "versions") + +versions.check(minimum_bazel_version = "0.7.0") + load("@io_bazel_rules_closure//closure:defs.bzl", "closure_repositories") # Prevent redundant loading of dependencies. From 16e1dccac103a74558b6bfd35b7f0de5fa627ac0 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Fri, 1 Jun 2018 12:27:36 +0900 Subject: [PATCH 02/22] Elasticsearch: Add an adapter to support V5 Add an adapter that adjusts the query content depending on the Elasticsearch version. Bug: Issue 6094 Also-by: Marco Miller Helped-by: David Ostrovsky Change-Id: Ie3de3f5cec25c44a9c56eb3c430e63d0ff858894 --- .../elasticsearch/AbstractElasticIndex.java | 8 +- .../elasticsearch/ElasticAccountIndex.java | 8 +- .../elasticsearch/ElasticChangeIndex.java | 10 +-- .../elasticsearch/ElasticGroupIndex.java | 8 +- .../gerrit/elasticsearch/ElasticMapping.java | 32 ++++++-- .../elasticsearch/ElasticQueryAdapter.java | 74 +++++++++++++++++++ .../ElasticRestClientProvider.java | 7 ++ .../builders/SearchSourceBuilder.java | 10 ++- 8 files changed, 130 insertions(+), 27 deletions(-) create mode 100644 gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticQueryAdapter.java diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java index 190c49875c..6f8fa061eb 100644 --- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java +++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java @@ -50,7 +50,6 @@ import org.elasticsearch.client.Response; abstract class AbstractElasticIndex implements Index { protected static final String BULK = "_bulk"; - protected static final String IGNORE_UNMAPPED = "ignore_unmapped"; protected static final String ORDER = "order"; protected static final String SEARCH = "_search"; @@ -80,8 +79,8 @@ abstract class AbstractElasticIndex implements Index { private final Schema schema; private final SitePaths sitePaths; private final String indexNameRaw; - private final ElasticRestClientProvider client; + protected final ElasticRestClientProvider client; protected final String indexName; protected final Gson gson; protected final ElasticQueryBuilder queryBuilder; @@ -130,7 +129,8 @@ abstract class AbstractElasticIndex implements Index { @Override public void deleteAll() throws IOException { // Delete the index, if it exists. - Response response = client.get().performRequest("HEAD", indexName); + String endpoint = indexName + client.adapter().indicesExistParam(); + Response response = client.get().performRequest("HEAD", endpoint); int statusCode = response.getStatusLine().getStatusCode(); if (statusCode == HttpStatus.SC_OK) { response = client.get().performRequest("DELETE", indexName); @@ -182,7 +182,7 @@ abstract class AbstractElasticIndex implements Index { protected JsonArray getSortArray(String idFieldName) { JsonObject properties = new JsonObject(); properties.addProperty(ORDER, "asc"); - properties.addProperty(IGNORE_UNMAPPED, true); + client.adapter().setIgnoreUnmapped(properties); JsonArray sortArray = new JsonArray(); addNamedElement(idFieldName, properties, sortArray); diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java index ba0ee58350..c5ab96741a 100644 --- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java +++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java @@ -61,8 +61,8 @@ public class ElasticAccountIndex extends AbstractElasticIndex schema) { - this.accounts = ElasticMapping.createMapping(schema); + public AccountMapping(Schema schema, ElasticQueryAdapter adapter) { + this.accounts = ElasticMapping.createMapping(schema, adapter); } } @@ -83,7 +83,7 @@ public class ElasticAccountIndex extends AbstractElasticIndex schema) { super(cfg, sitePaths, schema, client, ACCOUNTS); this.accountCache = accountCache; - this.mapping = new AccountMapping(schema); + this.mapping = new AccountMapping(schema, client.adapter()); this.schema = schema; } @@ -133,7 +133,7 @@ public class ElasticAccountIndex extends AbstractElasticIndex schema) { - MappingProperties mapping = ElasticMapping.createMapping(schema); + public ChangeMapping(Schema schema, ElasticQueryAdapter adapter) { + MappingProperties mapping = ElasticMapping.createMapping(schema, adapter); this.openChanges = mapping; this.closedChanges = mapping; } @@ -117,7 +117,7 @@ public class ElasticChangeIndex extends AbstractElasticIndex schema) { - this.groups = ElasticMapping.createMapping(schema); + public GroupMapping(Schema schema, ElasticQueryAdapter adapter) { + this.groups = ElasticMapping.createMapping(schema, adapter); } } @@ -80,7 +80,7 @@ public class ElasticGroupIndex extends AbstractElasticIndex schema) { super(cfg, sitePaths, schema, client, GROUPS); this.groupCache = groupCache; - this.mapping = new GroupMapping(schema); + this.mapping = new GroupMapping(schema, client.adapter()); this.schema = schema; } @@ -130,7 +130,7 @@ public class ElasticGroupIndex extends AbstractElasticIndex schema) { - ElasticMapping.Builder mapping = new ElasticMapping.Builder(); + static MappingProperties createMapping(Schema schema, ElasticQueryAdapter adapter) { + ElasticMapping.Builder mapping = new ElasticMapping.Builder(adapter); for (FieldDef field : schema.getFields().values()) { String name = field.getName(); FieldType fieldType = field.getType(); - if (fieldType == FieldType.EXACT || fieldType == FieldType.KEYWORD) { + if (fieldType == FieldType.EXACT) { mapping.addExactField(name); + } else if (fieldType == FieldType.KEYWORD) { + mapping.addKeywordField(name); } else if (fieldType == FieldType.TIMESTAMP) { mapping.addTimestamp(name); } else if (fieldType == FieldType.INTEGER @@ -46,9 +48,14 @@ class ElasticMapping { } static class Builder { + private final ElasticQueryAdapter adapter; private final ImmutableMap.Builder fields = new ImmutableMap.Builder<>(); + Builder(ElasticQueryAdapter adapter) { + this.adapter = adapter; + } + MappingProperties build() { MappingProperties properties = new MappingProperties(); properties.properties = fields.build(); @@ -56,9 +63,20 @@ class ElasticMapping { } Builder addExactField(String name) { - FieldProperties key = new FieldProperties("string"); - key.index = "not_analyzed"; - FieldProperties properties = new FieldProperties("string"); + FieldProperties key = new FieldProperties(adapter.keywordFieldType()); + key.index = adapter.indexProperty(); + FieldProperties properties; + properties = new FieldProperties(adapter.stringFieldType()); + properties.fields = ImmutableMap.of("key", key); + fields.put(name, properties); + return this; + } + + Builder addKeywordField(String name) { + FieldProperties key = new FieldProperties(adapter.keywordFieldType()); + key.index = adapter.indexProperty(); + FieldProperties properties; + properties = new FieldProperties(adapter.keywordFieldType()); properties.fields = ImmutableMap.of("key", key); fields.put(name, properties); return this; @@ -78,7 +96,7 @@ class ElasticMapping { } Builder addString(String name) { - fields.put(name, new FieldProperties("string")); + fields.put(name, new FieldProperties(adapter.stringFieldType())); return this; } diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticQueryAdapter.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticQueryAdapter.java new file mode 100644 index 0000000000..2ed75df464 --- /dev/null +++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticQueryAdapter.java @@ -0,0 +1,74 @@ +// Copyright (C) 2018 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package com.google.gerrit.elasticsearch; + +import com.google.gson.JsonObject; + +public class ElasticQueryAdapter { + private final boolean ignoreUnmapped; + private final String searchFilteringName; + private final String indicesExistParam; + private final String keywordFieldType; + private final String stringFieldType; + private final String indexProperty; + + ElasticQueryAdapter(ElasticVersion version) { + this.ignoreUnmapped = version == ElasticVersion.V2_4; + switch (version) { + case V5_6: + case V6_2: + this.searchFilteringName = "_source"; + this.indicesExistParam = "?allow_no_indices=false"; + this.keywordFieldType = "keyword"; + this.stringFieldType = "text"; + this.indexProperty = "true"; + break; + case V2_4: + default: + this.searchFilteringName = "fields"; + this.indicesExistParam = ""; + this.keywordFieldType = "string"; + this.stringFieldType = "string"; + this.indexProperty = "not_analyzed"; + break; + } + } + + void setIgnoreUnmapped(JsonObject properties) { + if (ignoreUnmapped) { + properties.addProperty("ignore_unmapped", true); + } + } + + public String searchFilteringName() { + return searchFilteringName; + } + + String indicesExistParam() { + return indicesExistParam; + } + + String keywordFieldType() { + return keywordFieldType; + } + + String stringFieldType() { + return stringFieldType; + } + + String indexProperty() { + return indexProperty; + } +} diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticRestClientProvider.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticRestClientProvider.java index 91f938c956..a69f851e0d 100644 --- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticRestClientProvider.java +++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticRestClientProvider.java @@ -44,6 +44,7 @@ class ElasticRestClientProvider implements Provider, LifecycleListen private final String password; private RestClient client; + private ElasticQueryAdapter adapter; @Inject ElasticRestClientProvider(ElasticConfiguration cfg) { @@ -69,6 +70,7 @@ class ElasticRestClientProvider implements Provider, LifecycleListen client = build(); ElasticVersion version = getVersion(); log.info("Elasticsearch integration version {}", version); + adapter = new ElasticQueryAdapter(version); } } } @@ -89,6 +91,11 @@ class ElasticRestClientProvider implements Provider, LifecycleListen } } + ElasticQueryAdapter adapter() { + get(); // Make sure we're connected + return adapter; + } + public static class FailedToGetVersion extends ElasticException { private static final long serialVersionUID = 1L; private static final String MESSAGE = "Failed to get Elasticsearch version"; diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/SearchSourceBuilder.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/SearchSourceBuilder.java index e72e9fa74c..35cbea99b6 100644 --- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/SearchSourceBuilder.java +++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/SearchSourceBuilder.java @@ -14,6 +14,7 @@ package com.google.gerrit.elasticsearch.builders; +import com.google.gerrit.elasticsearch.ElasticQueryAdapter; import java.io.IOException; import java.util.List; @@ -23,6 +24,7 @@ import java.util.List; *

A trimmed down and modified version of org.elasticsearch.search.builder.SearchSourceBuilder. */ public class SearchSourceBuilder { + private final ElasticQueryAdapter adapter; private QuerySourceBuilder querySourceBuilder; @@ -33,7 +35,9 @@ public class SearchSourceBuilder { private List fieldNames; /** Constructs a new search source builder. */ - public SearchSourceBuilder() {} + public SearchSourceBuilder(ElasticQueryAdapter adapter) { + this.adapter = adapter; + } /** Constructs a new search source builder with a search query. */ public SearchSourceBuilder query(QueryBuilder query) { @@ -95,9 +99,9 @@ public class SearchSourceBuilder { if (fieldNames != null) { if (fieldNames.size() == 1) { - builder.field("fields", fieldNames.get(0)); + builder.field(adapter.searchFilteringName(), fieldNames.get(0)); } else { - builder.startArray("fields"); + builder.startArray(adapter.searchFilteringName()); for (String fieldName : fieldNames) { builder.value(fieldName); } From 33be879ea3b4ab1e6c05d696e4c395411b72dcc7 Mon Sep 17 00:00:00 2001 From: Marco Miller Date: Fri, 1 Jun 2018 15:04:45 -0400 Subject: [PATCH 03/22] MatchQueryBuilder: Don't use deprecated "match" query Before this fix, warnings such as [1] used to be present in the Elasticsearch V5 logs. Elasticsearch V2 did/does not show them. Properly factor the match phrase queries (both plain and prefix ones), fitting the way to prepare them as per Elasticsearch V5 documentation. Doing this way happens to also be supported by Elasticsearch V2, so no version-based api usage switching required here (in this specific case). [1] "Deprecated field [type] used, replaced by [match_phrase and match_phrase_prefix query]". Bug: Issue 6094 Change-Id: I2b970c426b425957634981c9f4de0cc5cd474d03 --- .../builders/MatchQueryBuilder.java | 19 ++++++++----------- .../elasticsearch/builders/QueryBuilders.java | 4 ++-- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/MatchQueryBuilder.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/MatchQueryBuilder.java index 7a120801f8..c0becd1e4b 100644 --- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/MatchQueryBuilder.java +++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/MatchQueryBuilder.java @@ -27,9 +27,14 @@ class MatchQueryBuilder extends QueryBuilder { enum Type { /** The text is analyzed and used as a phrase query. */ - PHRASE, + MATCH_PHRASE, /** The text is analyzed and used in a phrase query, with the last term acting as a prefix. */ - PHRASE_PREFIX + MATCH_PHRASE_PREFIX; + + @Override + public String toString() { + return name().toLowerCase(Locale.US); + } } private final String name; @@ -52,14 +57,6 @@ class MatchQueryBuilder extends QueryBuilder { @Override protected void doXContent(XContentBuilder builder) throws IOException { - builder.startObject("match"); - builder.startObject(name); - - builder.field("query", text); - if (type != null) { - builder.field("type", type.toString().toLowerCase(Locale.ENGLISH)); - } - builder.endObject(); - builder.endObject(); + builder.startObject(type.toString()).field(name, text).endObject(); } } diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/QueryBuilders.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/QueryBuilders.java index 26fac4cceb..940146f147 100644 --- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/QueryBuilders.java +++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/builders/QueryBuilders.java @@ -33,7 +33,7 @@ public abstract class QueryBuilders { * @param text The query text (to be analyzed). */ public static MatchQueryBuilder matchPhraseQuery(String name, Object text) { - return new MatchQueryBuilder(name, text).type(MatchQueryBuilder.Type.PHRASE); + return new MatchQueryBuilder(name, text).type(MatchQueryBuilder.Type.MATCH_PHRASE); } /** @@ -43,7 +43,7 @@ public abstract class QueryBuilders { * @param text The query text (to be analyzed). */ public static MatchQueryBuilder matchPhrasePrefixQuery(String name, Object text) { - return new MatchQueryBuilder(name, text).type(MatchQueryBuilder.Type.PHRASE_PREFIX); + return new MatchQueryBuilder(name, text).type(MatchQueryBuilder.Type.MATCH_PHRASE_PREFIX); } /** From 8c058bf8622f49332e8ad40ee01f36ad8927c941 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Fri, 25 May 2018 19:53:22 +0900 Subject: [PATCH 04/22] Elasticsearch: Add tests for queries against version 5 Add separate test classes to test queries with Elasticsearch version 5. The entire test classes are basically copied from the existing ones, with the only difference being the version passed into the config and into the container creation. This cannot be achieved using an abstract class due to the container being created in the @BeforeClass annotated method which is static and cannot be overridden by a derived class. The byOwnerInvalidQuery test is moved up from ElasticQueryChangesTest to AbstractQueryChangesTest to avoid having to repeat it in all the Elasticsearch test classes. Bug: Issue 6094 Change-Id: I9b91cbcbc24924dce43b1be9530543097b5fd174 --- .../ElasticQueryChangesTest.java | 11 --- .../ElasticV5QueryAccountsTest.java | 68 ++++++++++++++++++ .../ElasticV5QueryChangesTest.java | 72 +++++++++++++++++++ .../ElasticV5QueryGroupsTest.java | 68 ++++++++++++++++++ .../change/AbstractQueryChangesTest.java | 8 +++ .../query/change/LuceneQueryChangesTest.java | 1 + 6 files changed, 217 insertions(+), 11 deletions(-) create mode 100644 gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV5QueryAccountsTest.java create mode 100644 gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV5QueryChangesTest.java create mode 100644 gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV5QueryGroupsTest.java diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticQueryChangesTest.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticQueryChangesTest.java index bf29cbbf44..fb21746920 100644 --- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticQueryChangesTest.java +++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticQueryChangesTest.java @@ -19,15 +19,12 @@ import com.google.gerrit.elasticsearch.testing.ElasticTestUtils; import com.google.gerrit.elasticsearch.testing.ElasticTestUtils.ElasticNodeInfo; import com.google.gerrit.server.query.change.AbstractQueryChangesTest; import com.google.gerrit.testutil.InMemoryModule; -import com.google.gerrit.testutil.InMemoryRepositoryManager.Repo; import com.google.inject.Guice; import com.google.inject.Injector; -import org.eclipse.jgit.junit.TestRepository; import org.eclipse.jgit.lib.Config; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Rule; -import org.junit.Test; import org.junit.rules.TestName; public class ElasticQueryChangesTest extends AbstractQueryChangesTest { @@ -72,12 +69,4 @@ public class ElasticQueryChangesTest extends AbstractQueryChangesTest { ElasticTestUtils.configure(elasticsearchConfig, nodeInfo.port, indicesPrefix); return Guice.createInjector(new InMemoryModule(elasticsearchConfig, notesMigration)); } - - @Test - public void byOwnerInvalidQuery() throws Exception { - TestRepository repo = createProject("repo"); - insert(repo, newChange(repo), userId); - String nameEmail = user.asIdentifiedUser().getNameEmail(); - assertQuery("owner: \"" + nameEmail + "\"\\"); - } } diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV5QueryAccountsTest.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV5QueryAccountsTest.java new file mode 100644 index 0000000000..e59824dc4d --- /dev/null +++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV5QueryAccountsTest.java @@ -0,0 +1,68 @@ +// Copyright (C) 2018 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package com.google.gerrit.elasticsearch; + +import com.google.gerrit.elasticsearch.testing.ElasticContainer; +import com.google.gerrit.elasticsearch.testing.ElasticTestUtils; +import com.google.gerrit.elasticsearch.testing.ElasticTestUtils.ElasticNodeInfo; +import com.google.gerrit.server.query.account.AbstractQueryAccountsTest; +import com.google.gerrit.testutil.InMemoryModule; +import com.google.inject.Guice; +import com.google.inject.Injector; +import org.eclipse.jgit.lib.Config; +import org.junit.AfterClass; +import org.junit.BeforeClass; + +public class ElasticV5QueryAccountsTest extends AbstractQueryAccountsTest { + private static ElasticNodeInfo nodeInfo; + private static ElasticContainer container; + + @BeforeClass + public static void startIndexService() { + if (nodeInfo != null) { + // do not start Elasticsearch twice + return; + } + + container = ElasticContainer.createAndStart(ElasticVersion.V5_6); + nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); + } + + @AfterClass + public static void stopElasticsearchServer() { + if (container != null) { + container.stop(); + } + } + + private String testName() { + return testName.getMethodName().toLowerCase() + "_"; + } + + @Override + protected void initAfterLifecycleStart() throws Exception { + super.initAfterLifecycleStart(); + ElasticTestUtils.createAllIndexes(injector); + } + + @Override + protected Injector createInjector() { + Config elasticsearchConfig = new Config(config); + InMemoryModule.setDefaults(elasticsearchConfig); + String indicesPrefix = testName(); + ElasticTestUtils.configure(elasticsearchConfig, nodeInfo.port, indicesPrefix); + return Guice.createInjector(new InMemoryModule(elasticsearchConfig, notesMigration)); + } +} diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV5QueryChangesTest.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV5QueryChangesTest.java new file mode 100644 index 0000000000..f9631009c0 --- /dev/null +++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV5QueryChangesTest.java @@ -0,0 +1,72 @@ +// Copyright (C) 2018 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package com.google.gerrit.elasticsearch; + +import com.google.gerrit.elasticsearch.testing.ElasticContainer; +import com.google.gerrit.elasticsearch.testing.ElasticTestUtils; +import com.google.gerrit.elasticsearch.testing.ElasticTestUtils.ElasticNodeInfo; +import com.google.gerrit.server.query.change.AbstractQueryChangesTest; +import com.google.gerrit.testutil.InMemoryModule; +import com.google.inject.Guice; +import com.google.inject.Injector; +import org.eclipse.jgit.lib.Config; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Rule; +import org.junit.rules.TestName; + +public class ElasticV5QueryChangesTest extends AbstractQueryChangesTest { + @Rule public final TestName testName = new TestName(); + + private static ElasticNodeInfo nodeInfo; + private static ElasticContainer container; + + @BeforeClass + public static void startIndexService() { + if (nodeInfo != null) { + // do not start Elasticsearch twice + return; + } + + container = ElasticContainer.createAndStart(ElasticVersion.V5_6); + nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); + } + + @AfterClass + public static void stopElasticsearchServer() { + if (container != null) { + container.stop(); + } + } + + private String testName() { + return testName.getMethodName().toLowerCase() + "_"; + } + + @Override + protected void initAfterLifecycleStart() throws Exception { + super.initAfterLifecycleStart(); + ElasticTestUtils.createAllIndexes(injector); + } + + @Override + protected Injector createInjector() { + Config elasticsearchConfig = new Config(config); + InMemoryModule.setDefaults(elasticsearchConfig); + String indicesPrefix = testName(); + ElasticTestUtils.configure(elasticsearchConfig, nodeInfo.port, indicesPrefix); + return Guice.createInjector(new InMemoryModule(elasticsearchConfig, notesMigration)); + } +} diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV5QueryGroupsTest.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV5QueryGroupsTest.java new file mode 100644 index 0000000000..6665801dea --- /dev/null +++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV5QueryGroupsTest.java @@ -0,0 +1,68 @@ +// Copyright (C) 2018 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package com.google.gerrit.elasticsearch; + +import com.google.gerrit.elasticsearch.testing.ElasticContainer; +import com.google.gerrit.elasticsearch.testing.ElasticTestUtils; +import com.google.gerrit.elasticsearch.testing.ElasticTestUtils.ElasticNodeInfo; +import com.google.gerrit.server.query.group.AbstractQueryGroupsTest; +import com.google.gerrit.testutil.InMemoryModule; +import com.google.inject.Guice; +import com.google.inject.Injector; +import org.eclipse.jgit.lib.Config; +import org.junit.AfterClass; +import org.junit.BeforeClass; + +public class ElasticV5QueryGroupsTest extends AbstractQueryGroupsTest { + private static ElasticNodeInfo nodeInfo; + private static ElasticContainer container; + + @BeforeClass + public static void startIndexService() { + if (nodeInfo != null) { + // do not start Elasticsearch twice + return; + } + + container = ElasticContainer.createAndStart(ElasticVersion.V5_6); + nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); + } + + @AfterClass + public static void stopElasticsearchServer() { + if (container != null) { + container.stop(); + } + } + + private String testName() { + return testName.getMethodName().toLowerCase() + "_"; + } + + @Override + protected void initAfterLifecycleStart() throws Exception { + super.initAfterLifecycleStart(); + ElasticTestUtils.createAllIndexes(injector); + } + + @Override + protected Injector createInjector() { + Config elasticsearchConfig = new Config(config); + InMemoryModule.setDefaults(elasticsearchConfig); + String indicesPrefix = testName(); + ElasticTestUtils.configure(elasticsearchConfig, nodeInfo.port, indicesPrefix); + return Guice.createInjector(new InMemoryModule(elasticsearchConfig, notesMigration)); + } +} diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java index 79a4ab7634..7676e48de1 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java @@ -2197,6 +2197,14 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests { assertQuery("query:query4"); } + @Test + public void byOwnerInvalidQuery() throws Exception { + TestRepository repo = createProject("repo"); + insert(repo, newChange(repo), userId); + String nameEmail = user.asIdentifiedUser().getNameEmail(); + assertQuery("owner: \"" + nameEmail + "\"\\"); + } + protected ChangeInserter newChange(TestRepository repo) throws Exception { return newChange(repo, null, null, null, null); } diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/LuceneQueryChangesTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/change/LuceneQueryChangesTest.java index d3ecc296e9..9362ce9df7 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/LuceneQueryChangesTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/query/change/LuceneQueryChangesTest.java @@ -51,6 +51,7 @@ public class LuceneQueryChangesTest extends AbstractQueryChangesTest { } @Test + @Override public void byOwnerInvalidQuery() throws Exception { TestRepository repo = createProject("repo"); Change change1 = insert(repo, newChange(repo), userId); From 1492e86cd2439ed26fe9f5c25c15ef6e7fb2652d Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Sun, 27 May 2018 15:00:56 +0900 Subject: [PATCH 05/22] ElasticReindexIT: Add tests against Elasticsearch version 5 Bug: Issue 6094 Change-Id: I324d099ee4cc484fcdfea8679e38cc2d3d2b5905 --- .../gerrit/acceptance/pgm/ElasticReindexIT.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java index f4ffc3c84d..683ec91699 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java @@ -15,6 +15,7 @@ package com.google.gerrit.acceptance.pgm; import com.google.gerrit.acceptance.NoHttpd; +import com.google.gerrit.elasticsearch.ElasticVersion; import com.google.gerrit.elasticsearch.testing.ElasticContainer; import com.google.gerrit.elasticsearch.testing.ElasticTestUtils; import com.google.gerrit.elasticsearch.testing.ElasticTestUtils.ElasticNodeInfo; @@ -28,11 +29,10 @@ import org.junit.After; public class ElasticReindexIT extends AbstractReindexTests { private static ElasticContainer container; - @ConfigSuite.Default - public static Config elasticsearch() { + private static Config getConfig(ElasticVersion version) { ElasticNodeInfo elasticNodeInfo; try { - container = ElasticContainer.createAndStart(); + container = ElasticContainer.createAndStart(version); elasticNodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); } catch (Throwable t) { return null; @@ -43,6 +43,16 @@ public class ElasticReindexIT extends AbstractReindexTests { return cfg; } + @ConfigSuite.Default + public static Config elasticsearchV2() { + return getConfig(ElasticVersion.V2_4); + } + + @ConfigSuite.Config + public static Config elasticsearchV5() { + return getConfig(ElasticVersion.V5_6); + } + @Override public void configureIndex(Injector injector) throws Exception { ElasticTestUtils.createAllIndexes(injector); From 2bf355df5a407642c8f5dc52be25de5251c7050d Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Wed, 30 May 2018 08:58:22 +0200 Subject: [PATCH 06/22] Bump minimum Bazel version to 0.14.0 and activate caches During migration from Buck to Bazel we lost action caches activation per default. For one, local action cache wasn't implemented in Bazel, for another, there was no option to specify HOME directory. I fixed both problems and starting with Bazel 0.14.0 both features are included in released Bazel version: [1], [2]. There is still one not implemented option, limit the cache directory with max size: [3]. But for now the advantage to activate the caches per default far outweigh the disadvantage of unlimited growth of size of cache directory beyound imaginary max size of say 10 GB. In meantime we add a warning to watch the size of the directory cache and periodically clean cache directory: $ rm -rf ~/.gerritcodereview/bazel-cache/cas/* [1] https://bazel-review.googlesource.com/#/c/bazel/+/16810 [2] https://github.com/bazelbuild/bazel/pull/4852 [3] https://github.com/bazelbuild/bazel/issues/5139 Change-Id: I42e8f6fb9770a5976751ffef286c0fe80b75cf93 --- Documentation/dev-bazel.txt | 12 ++++++++++++ WORKSPACE | 2 +- tools/bazel.rc | 3 +++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Documentation/dev-bazel.txt b/Documentation/dev-bazel.txt index a83ca0d6ab..473245b163 100644 --- a/Documentation/dev-bazel.txt +++ b/Documentation/dev-bazel.txt @@ -364,6 +364,18 @@ To consume the JGit dependency from the development tree, edit `lib/jgit/jgit.bzl` setting LOCAL_JGIT_REPO to a directory holding a JGit repository. +[[bazel-local-caches]] + +To accelerate builds, number of caches are activated per default: + +* ~/.gerritcodereview/bazel-cache/downloaded-artifacts +* ~/.gerritcodereview/bazel-cache/repository +* ~/.gerritcodereview/bazel-cache/cas + +All these caches currently don't have max. size limit, +link:https://github.com/bazelbuild/bazel/issues/5139[see this pending issue], +The users should watch their size and clean them manually if needed. + GERRIT ------ Part of link:index.html[Gerrit Code Review] diff --git a/WORKSPACE b/WORKSPACE index 497ee8758d..3d1de73fd3 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -29,7 +29,7 @@ http_file( load("@bazel_skylib//:lib.bzl", "versions") -versions.check(minimum_bazel_version = "0.7.0") +versions.check(minimum_bazel_version = "0.14.0") load("@io_bazel_rules_closure//closure:defs.bzl", "closure_repositories") diff --git a/tools/bazel.rc b/tools/bazel.rc index ab974d955b..8f158e97ed 100644 --- a/tools/bazel.rc +++ b/tools/bazel.rc @@ -1,2 +1,5 @@ build --workspace_status_command=./tools/workspace-status.sh --strategy=Closure=worker +build --disk_cache=~/.gerritcodereview/bazel-cache/cas +build --repository_cache=~/.gerritcodereview/bazel-cache/repository +build --experimental_strict_action_env test --build_tests_only From cc9919c881ae31ec8550674d24bcd6cd7ba6f2ef Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Mon, 4 Jun 2018 23:19:34 +0900 Subject: [PATCH 07/22] dev-contributing: Update buildifier to latest released version Change-Id: I755daee537b98f76620f0bd5b8d7bc69c28faa5f --- Documentation/dev-contributing.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/dev-contributing.txt b/Documentation/dev-contributing.txt index 66036b6289..242c042cea 100644 --- a/Documentation/dev-contributing.txt +++ b/Documentation/dev-contributing.txt @@ -154,7 +154,7 @@ Guide]. To format Java source code, Gerrit uses the link:https://github.com/google/google-java-format[`google-java-format`] tool (version 1.5), and to format Bazel BUILD and WORKSPACE files the -link:https://github.com/bazelbuild/buildifier[`buildifier`] tool (version 0.6.0). +link:https://github.com/bazelbuild/buildifier[`buildifier`] tool (version 0.11.1). These tools automatically apply format according to the style guides; this streamlines code review by reducing the need for time-consuming, tedious, and contentious discussions about trivial issues like whitespace. From fd0775f1a439cec89c0526f95556e7b6b584b9e3 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Mon, 4 Jun 2018 23:22:01 +0900 Subject: [PATCH 08/22] dev-contributing: Update link to buildifier tool Change-Id: I93adcabfd572305a93d54157bbe22703421385a6 --- Documentation/dev-contributing.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/dev-contributing.txt b/Documentation/dev-contributing.txt index 242c042cea..22e317405c 100644 --- a/Documentation/dev-contributing.txt +++ b/Documentation/dev-contributing.txt @@ -154,7 +154,8 @@ Guide]. To format Java source code, Gerrit uses the link:https://github.com/google/google-java-format[`google-java-format`] tool (version 1.5), and to format Bazel BUILD and WORKSPACE files the -link:https://github.com/bazelbuild/buildifier[`buildifier`] tool (version 0.11.1). +link:https://github.com/bazelbuild/buildtools/tree/master/buildifier[`buildifier`] +tool (version 0.11.1). These tools automatically apply format according to the style guides; this streamlines code review by reducing the need for time-consuming, tedious, and contentious discussions about trivial issues like whitespace. From c90fc220c96a0619864553ee03c40f622f489187 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Wed, 30 May 2018 21:50:25 +0200 Subject: [PATCH 09/22] Bazel: Bump rules_closure to 0.7.0 Recent release updated dependencies and is compatible with Java 9. Replace our fork with the official released version. Change-Id: I187496bae00ef098003b875e566aa5ac90b9aabb --- WORKSPACE | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 3d1de73fd3..73469a400a 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -13,9 +13,9 @@ http_archive( http_archive( name = "io_bazel_rules_closure", - sha256 = "6691c58a2cd30a86776dd9bb34898b041e37136f2dc7e24cadaeaf599c95c657", - strip_prefix = "rules_closure-08039ba8ca59f64248bb3b6ae016460fe9c9914f", - url = "https://github.com/bazelbuild/rules_closure/archive/08039ba8ca59f64248bb3b6ae016460fe9c9914f.tar.gz", + sha256 = "a80acb69c63d5f6437b099c111480a4493bad4592015af2127a2f49fb7512d8d", + strip_prefix = "rules_closure-0.7.0", + url = "https://github.com/bazelbuild/rules_closure/archive/0.7.0.tar.gz", ) # File is specific to Polymer and copied from the Closure Github -- should be From 6dc8c42960905868ed492f0d4a6181c7a2e71bcb Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Sat, 2 Jun 2018 09:07:09 +0200 Subject: [PATCH 10/22] Bazel: Replace native {http,git}_archive with Skylark rules Future Bazel versions will discontinue support for native http rules and replace them with Skylark equivalents: [1]. Prepare the Gerit build tool chain for that move. The replacements depend on this PR in rules_closure project: [2], that wasn't merged yet. For now we can apply "patch on import", thanks Skylark's http rules patch support. When [2] is merged, and new version of rules_clsoure is released, we can remove the patching procedure. One side effect of this change is that Skylark version of http_file lost the ability to save the downloaded artifact under its real name and is using a generic download file name. The rule closure tool chain stumbles on this, and rejects to accept polymer_closure artifact without ".js" suffix. To rectify add intermediate rule and renamed "download" file to one with js suffix "polymer_closure_renamed.js": [3]. [1] https://groups.google.com/d/topic/bazel-discuss/dO2MHQLwJF0/discussion [2] https://github.com/bazelbuild/rules_closure/pull/270 [3] http://paste.openstack.org/show/722557 Inspired-By: "Klaus Aehlig" Feature: Issue 9151 Change-Id: I44ca2ecfea67d2f4434a4743e7a6f8a3645e96a8 --- ...http-git-_archive-with-Skylark-rules.patch | 133 ++++++++++++++++++ WORKSPACE | 5 +- lib/polymer_externs/BUILD | 9 +- 3 files changed, 145 insertions(+), 2 deletions(-) create mode 100644 0001-Replace-native-http-git-_archive-with-Skylark-rules.patch diff --git a/0001-Replace-native-http-git-_archive-with-Skylark-rules.patch b/0001-Replace-native-http-git-_archive-with-Skylark-rules.patch new file mode 100644 index 0000000000..3ccf5cdd02 --- /dev/null +++ b/0001-Replace-native-http-git-_archive-with-Skylark-rules.patch @@ -0,0 +1,133 @@ +Date: Wed, 30 May 2018 21:22:18 +0200 +Subject: [PATCH] Replace native {http,git}_archive with Skylark rules + +See [1] for more details. + +Test Plan: + +* Apply this CL on Bazel master: [2] and build bazel +* Run with this custom built bazel version: + + $ bazel test //javatests/... + $ bazel test //closure/... + +[1] https://groups.google.com/d/topic/bazel-discuss/dO2MHQLwJF0/discussion +[2] https://bazel-review.googlesource.com/#/c/bazel/+/55932/ +--- + closure/repositories.bzl | 23 ++++++++++++----------- + 1 file changed, 12 insertions(+), 11 deletions(-) + +diff --git a/closure/repositories.bzl b/closure/repositories.bzl +index 9b84a72..2816fb6 100644 +--- closure/repositories.bzl ++++ closure/repositories.bzl +@@ -14,6 +14,7 @@ + + """External dependencies for Closure Rules.""" + ++load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file") + load("//closure/private:java_import_external.bzl", "java_import_external") + load("//closure/private:platform_http_file.bzl", "platform_http_file") + load("//closure:filegroup_external.bzl", "filegroup_external") +@@ -405,7 +406,7 @@ def com_google_common_html_types(): + ) + + def com_google_common_html_types_html_proto(): +- native.http_file( ++ http_file( + name = "com_google_common_html_types_html_proto", + sha256 = "6ece202f11574e37d0c31d9cf2e9e11a0dbc9218766d50d211059ebd495b49c3", + urls = [ +@@ -633,7 +634,7 @@ def com_google_javascript_closure_compiler(): + + def com_google_javascript_closure_library(): + # After updating: bazel run //closure/library:regenerate -- "$PWD" +- native.new_http_archive( ++ http_archive( + name = "com_google_javascript_closure_library", + urls = [ + "https://mirror.bazel.build/github.com/google/closure-library/archive/v20180405.tar.gz", +@@ -658,7 +659,7 @@ def com_google_jsinterop_annotations(): + + def com_google_protobuf(): + # Note: Protobuf 3.6.0+ is going to use C++11 +- native.http_archive( ++ http_archive( + name = "com_google_protobuf", + strip_prefix = "protobuf-3.5.1", + sha256 = "826425182ee43990731217b917c5c3ea7190cfda141af4869e6d4ad9085a740f", +@@ -669,7 +670,7 @@ def com_google_protobuf(): + ) + + def com_google_protobuf_js(): +- native.new_http_archive( ++ http_archive( + name = "com_google_protobuf_js", + urls = [ + "https://mirror.bazel.build/github.com/google/protobuf/archive/v3.5.1.tar.gz", +@@ -722,7 +723,7 @@ def com_google_template_soy(): + ) + + def com_google_template_soy_jssrc(): +- native.new_http_archive( ++ http_archive( + name = "com_google_template_soy_jssrc", + sha256 = "c76ab4cb6e46a7c76336640b3c40d6897b420209a6c0905cdcd32533dda8126a", + urls = [ +@@ -757,7 +758,7 @@ def com_squareup_javapoet(): + ) + + def fonts_noto_hinted_deb(): +- native.http_file( ++ http_file( + name = "fonts_noto_hinted_deb", + urls = [ + "https://mirror.bazel.build/http.us.debian.org/debian/pool/main/f/fonts-noto/fonts-noto-hinted_20161116-1_all.deb", +@@ -767,7 +768,7 @@ def fonts_noto_hinted_deb(): + ) + + def fonts_noto_mono_deb(): +- native.http_file( ++ http_file( + name = "fonts_noto_mono_deb", + urls = [ + "https://mirror.bazel.build/http.us.debian.org/debian/pool/main/f/fonts-noto/fonts-noto-mono_20161116-1_all.deb", +@@ -801,7 +802,7 @@ def javax_inject(): + ) + + def libexpat_amd64_deb(): +- native.http_file( ++ http_file( + name = "libexpat_amd64_deb", + urls = [ + "https://mirror.bazel.build/http.us.debian.org/debian/pool/main/e/expat/libexpat1_2.1.0-6+deb8u3_amd64.deb", +@@ -811,7 +812,7 @@ def libexpat_amd64_deb(): + ) + + def libfontconfig_amd64_deb(): +- native.http_file( ++ http_file( + name = "libfontconfig_amd64_deb", + urls = [ + "https://mirror.bazel.build/http.us.debian.org/debian/pool/main/f/fontconfig/libfontconfig1_2.11.0-6.3+deb8u1_amd64.deb", +@@ -821,7 +822,7 @@ def libfontconfig_amd64_deb(): + ) + + def libfreetype_amd64_deb(): +- native.http_file( ++ http_file( + name = "libfreetype_amd64_deb", + urls = [ + "https://mirror.bazel.build/http.us.debian.org/debian/pool/main/f/freetype/libfreetype6_2.5.2-3+deb8u1_amd64.deb", +@@ -831,7 +832,7 @@ def libfreetype_amd64_deb(): + ) + + def libpng_amd64_deb(): +- native.http_file( ++ http_file( + name = "libpng_amd64_deb", + urls = [ + "https://mirror.bazel.build/http.us.debian.org/debian/pool/main/libp/libpng/libpng12-0_1.2.50-2+deb8u2_amd64.deb", +-- +2.16.3 + diff --git a/WORKSPACE b/WORKSPACE index 73469a400a..786b9ce584 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1,5 +1,6 @@ workspace(name = "gerrit") +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file") load("//tools/bzl:maven_jar.bzl", "maven_jar", "GERRIT", "MAVEN_LOCAL") load("//lib/codemirror:cm.bzl", "CM_VERSION", "DIFF_MATCH_PATCH_VERSION") load("//plugins:external_plugin_deps.bzl", "external_plugin_deps") @@ -13,6 +14,8 @@ http_archive( http_archive( name = "io_bazel_rules_closure", + build_file_content = "exports_files([\"0001-Replace-native-http-git-_archive-with-Skylark-rules.patch\"])", + patches = ["//:0001-Replace-native-http-git-_archive-with-Skylark-rules.patch"], sha256 = "a80acb69c63d5f6437b099c111480a4493bad4592015af2127a2f49fb7512d8d", strip_prefix = "rules_closure-0.7.0", url = "https://github.com/bazelbuild/rules_closure/archive/0.7.0.tar.gz", @@ -24,7 +27,7 @@ http_archive( http_file( name = "polymer_closure", sha256 = "5a589bdba674e1fec7188e9251c8624ebf2d4d969beb6635f9148f420d1e08b1", - url = "https://raw.githubusercontent.com/google/closure-compiler/775609aad61e14aef289ebec4bfc09ad88877f9e/contrib/externs/polymer-1.0.js", + urls = ["https://raw.githubusercontent.com/google/closure-compiler/775609aad61e14aef289ebec4bfc09ad88877f9e/contrib/externs/polymer-1.0.js"], ) load("@bazel_skylib//:lib.bzl", "versions") diff --git a/lib/polymer_externs/BUILD b/lib/polymer_externs/BUILD index 2f1bdbded2..ae8f9c0ffe 100644 --- a/lib/polymer_externs/BUILD +++ b/lib/polymer_externs/BUILD @@ -18,9 +18,16 @@ package( load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_library") +genrule( + name = "polymer_closure_renamed", + srcs = ["@polymer_closure//file"], + outs = ["polymer_closure_renamed.js"], + cmd = "cp $< $@", +) + closure_js_library( name = "polymer_closure", - srcs = ["@polymer_closure//file"], + srcs = [":polymer_closure_renamed"], data = ["//lib:LICENSE-Apache2.0"], no_closure_library = True, ) From cb13335e6316500ece50d36daa2a60a2c86a7ae1 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 5 Jun 2018 11:47:46 +0900 Subject: [PATCH 11/22] Hoist declaration of TestName up to GerritBaseTests So it doesn't need to be declared in all the tests that use it. Change-Id: Ib461165fa8b7b7b34ab619e6a34efb7656bb0968 --- .../google/gerrit/elasticsearch/ElasticQueryChangesTest.java | 4 ---- .../gerrit/elasticsearch/ElasticV5QueryChangesTest.java | 4 ---- .../server/query/account/AbstractQueryAccountsTest.java | 4 ---- .../gerrit/server/query/group/AbstractQueryGroupsTest.java | 4 ---- .../test/java/com/google/gerrit/testutil/GerritBaseTests.java | 2 ++ 5 files changed, 2 insertions(+), 16 deletions(-) diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticQueryChangesTest.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticQueryChangesTest.java index fb21746920..4bfa075fee 100644 --- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticQueryChangesTest.java +++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticQueryChangesTest.java @@ -24,12 +24,8 @@ import com.google.inject.Injector; import org.eclipse.jgit.lib.Config; import org.junit.AfterClass; import org.junit.BeforeClass; -import org.junit.Rule; -import org.junit.rules.TestName; public class ElasticQueryChangesTest extends AbstractQueryChangesTest { - @Rule public final TestName testName = new TestName(); - private static ElasticNodeInfo nodeInfo; private static ElasticContainer container; diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV5QueryChangesTest.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV5QueryChangesTest.java index f9631009c0..c44d50c80c 100644 --- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV5QueryChangesTest.java +++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticV5QueryChangesTest.java @@ -24,12 +24,8 @@ import com.google.inject.Injector; import org.eclipse.jgit.lib.Config; import org.junit.AfterClass; import org.junit.BeforeClass; -import org.junit.Rule; -import org.junit.rules.TestName; public class ElasticV5QueryChangesTest extends AbstractQueryChangesTest { - @Rule public final TestName testName = new TestName(); - private static ElasticNodeInfo nodeInfo; private static ElasticContainer container; diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/account/AbstractQueryAccountsTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/account/AbstractQueryAccountsTest.java index 1cf3728a26..b295f0837f 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/query/account/AbstractQueryAccountsTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/query/account/AbstractQueryAccountsTest.java @@ -72,9 +72,7 @@ import org.eclipse.jgit.lib.Config; import org.junit.After; import org.junit.Before; import org.junit.Ignore; -import org.junit.Rule; import org.junit.Test; -import org.junit.rules.TestName; @Ignore public abstract class AbstractQueryAccountsTest extends GerritServerTests { @@ -85,8 +83,6 @@ public abstract class AbstractQueryAccountsTest extends GerritServerTests { return cfg; } - @Rule public final TestName testName = new TestName(); - @Inject protected AccountCache accountCache; @Inject protected AccountManager accountManager; diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java index 52b75eb972..de39764c30 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java @@ -58,9 +58,7 @@ import org.eclipse.jgit.lib.Config; import org.junit.After; import org.junit.Before; import org.junit.Ignore; -import org.junit.Rule; import org.junit.Test; -import org.junit.rules.TestName; @Ignore public abstract class AbstractQueryGroupsTest extends GerritServerTests { @@ -71,8 +69,6 @@ public abstract class AbstractQueryGroupsTest extends GerritServerTests { return cfg; } - @Rule public final TestName testName = new TestName(); - @Inject protected AccountCache accountCache; @Inject protected AccountManager accountManager; diff --git a/gerrit-server/src/test/java/com/google/gerrit/testutil/GerritBaseTests.java b/gerrit-server/src/test/java/com/google/gerrit/testutil/GerritBaseTests.java index 4f08c9e73b..9135c553c0 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/testutil/GerritBaseTests.java +++ b/gerrit-server/src/test/java/com/google/gerrit/testutil/GerritBaseTests.java @@ -19,6 +19,7 @@ import com.google.gwtorm.server.StandardKeyEncoder; import org.junit.Ignore; import org.junit.Rule; import org.junit.rules.ExpectedException; +import org.junit.rules.TestName; @Ignore public abstract class GerritBaseTests { @@ -27,4 +28,5 @@ public abstract class GerritBaseTests { } @Rule public ExpectedException exception = ExpectedException.none(); + @Rule public final TestName testName = new TestName(); } From 42cb2931beed219d70b1e36215d666e751fac6b8 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 5 Jun 2018 14:49:06 +0900 Subject: [PATCH 12/22] dev-bazel: Improve documentation of build caches Change-Id: Id447987afcacbc242924215e187ff39e4912d915 --- Documentation/dev-bazel.txt | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/Documentation/dev-bazel.txt b/Documentation/dev-bazel.txt index 473245b163..2d5c4540da 100644 --- a/Documentation/dev-bazel.txt +++ b/Documentation/dev-bazel.txt @@ -366,15 +366,26 @@ JGit repository. [[bazel-local-caches]] -To accelerate builds, number of caches are activated per default: +To accelerate builds, several caches are activated per default: * ~/.gerritcodereview/bazel-cache/downloaded-artifacts * ~/.gerritcodereview/bazel-cache/repository * ~/.gerritcodereview/bazel-cache/cas -All these caches currently don't have max. size limit, -link:https://github.com/bazelbuild/bazel/issues/5139[see this pending issue], -The users should watch their size and clean them manually if needed. +Currently none of these caches have a maximum size limit. See +link:https://github.com/bazelbuild/bazel/issues/5139[this bazel issue] for +details. Users should watch the cache sizes and clean them manually if +necessary. + +Due to the `--experimental_strict_action_env` option used in `bazelrc` +it is possible that some commands required by the build are not found +on the PATH, causing the build to fail. In this case the PATH used in +the build can be overridden with the `--action_env=PATH` directive in +the user's `~/.bazelrc` file, for example: + +---- + build --action_env=PATH=/usr/local/opt/coreutils/libexec/gnubin/:/usr/local/bin/:/usr/bin/ +---- GERRIT ------ From c46fb11fd1adcf5e2f8c1f4a0fe2916dbc3193f1 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 5 Jun 2018 09:02:45 +0900 Subject: [PATCH 13/22] AbstractElasticIndex: Rename getActions to getDeleteActions The getActions method is only ever called from the delete(K) method to add the actions for deleting an item. It's only needed because in the change index implementation it is necessary to add multiple actions. Rename it to getDeleteActions which is more aligned with its purpose. Also clean up the parameter names in these methods. Instead of naming them all 'c', which is leftover from when we only had the change index, rename them to 'id' in the abstract class, and to 'a' and 'g' in the account and group index implementations. Change-Id: Ib1dde44f12147a5396b3296666aafefcd9e4846b --- .../gerrit/elasticsearch/AbstractElasticIndex.java | 13 ++++++------- .../gerrit/elasticsearch/ElasticAccountIndex.java | 4 ++-- .../gerrit/elasticsearch/ElasticChangeIndex.java | 2 +- .../gerrit/elasticsearch/ElasticGroupIndex.java | 4 ++-- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java index 6f8fa061eb..d3e6043b5b 100644 --- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java +++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java @@ -116,13 +116,13 @@ abstract class AbstractElasticIndex implements Index { } @Override - public void delete(K c) throws IOException { + public void delete(K id) throws IOException { String uri = getURI(indexNameRaw, BULK); - Response response = postRequest(addActions(c), uri, getRefreshParam()); + Response response = postRequest(getDeleteActions(id), uri, getRefreshParam()); int statusCode = response.getStatusLine().getStatusCode(); if (statusCode != HttpStatus.SC_OK) { throw new IOException( - String.format("Failed to delete %s from index %s: %s", c, indexName, statusCode)); + String.format("Failed to delete %s from index %s: %s", id, indexName, statusCode)); } } @@ -150,15 +150,14 @@ abstract class AbstractElasticIndex implements Index { } } - protected abstract String addActions(K c); + protected abstract String getDeleteActions(K id); protected abstract String getMappings(); protected abstract String getId(V v); - protected String delete(String type, K c) { - String id = c.toString(); - return new DeleteRequest(id, indexNameRaw, type).toString(); + protected String delete(String type, K id) { + return new DeleteRequest(id.toString(), indexNameRaw, type).toString(); } protected void addNamedElement(String name, JsonObject element, JsonArray array) { diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java index c5ab96741a..178014cea4 100644 --- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java +++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticAccountIndex.java @@ -110,8 +110,8 @@ public class ElasticAccountIndex extends AbstractElasticIndex Date: Sat, 1 Jul 2017 19:45:28 +0200 Subject: [PATCH 14/22] AbstractReindexTests: Assert account index and group index Change-Id: Ib288d117adedd5a3c915dc58a774ca65e33e20b5 --- .../gerrit/acceptance/StandaloneSiteTest.java | 17 ++++++++++++++++- .../acceptance/pgm/AbstractReindexTests.java | 15 +++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/StandaloneSiteTest.java b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/StandaloneSiteTest.java index be34ba65f6..9aa09db01a 100644 --- a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/StandaloneSiteTest.java +++ b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/StandaloneSiteTest.java @@ -19,6 +19,9 @@ import static java.util.stream.Collectors.joining; import static org.junit.Assert.fail; import com.google.common.collect.Streams; +import com.google.gerrit.extensions.api.GerritApi; +import com.google.gerrit.extensions.api.groups.GroupInput; +import com.google.gerrit.extensions.restapi.ResourceNotFoundException; import com.google.gerrit.launcher.GerritLauncher; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.server.ReviewDb; @@ -31,6 +34,7 @@ import com.google.gerrit.testutil.ConfigSuite; import com.google.inject.Injector; import com.google.inject.Provider; import java.util.Arrays; +import java.util.Collections; import org.eclipse.jgit.lib.Config; import org.junit.Rule; import org.junit.rules.RuleChain; @@ -54,6 +58,17 @@ public abstract class StandaloneSiteTest { adminId = i.getInstance(AccountCreator.class).admin().getId(); } ctx = i.getInstance(OneOffRequestContext.class).openAs(adminId); + GerritApi gApi = i.getInstance(GerritApi.class); + + try { + // ServerContext ctor is called multiple times but the group can be only created once + gApi.groups().id("Group"); + } catch (ResourceNotFoundException e) { + GroupInput in = new GroupInput(); + in.members = Collections.singletonList("admin"); + in.name = "Group"; + gApi.groups().create(in); + } } @Override @@ -102,9 +117,9 @@ public abstract class StandaloneSiteTest { @Rule public RuleChain ruleChain = RuleChain.outerRule(tempSiteDir).around(testRunner); protected SitePaths sitePaths; + protected Account.Id adminId; private GerritServer.Description serverDesc; - private Account.Id adminId; private void beforeTest(Description description) throws Exception { serverDesc = GerritServer.Description.forTestMethod(description, configName); diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/AbstractReindexTests.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/AbstractReindexTests.java index 9f8a77c03a..9242e3f2f1 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/AbstractReindexTests.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/AbstractReindexTests.java @@ -15,6 +15,7 @@ package com.google.gerrit.acceptance.pgm; import static com.google.common.truth.Truth8.assertThat; +import static com.google.gerrit.extensions.client.ListGroupsOption.MEMBERS; import com.google.common.io.MoreFiles; import com.google.common.io.RecursiveDeleteOption; @@ -59,8 +60,22 @@ public abstract class AbstractReindexTests extends StandaloneSiteTest { try (ServerContext ctx = startServer()) { GerritApi gApi = ctx.getInjector().getInstance(GerritApi.class); + // Query change index assertThat(gApi.changes().query("message:Test").get().stream().map(c -> c.changeId)) .containsExactly(changeId); + // Query account index + assertThat(gApi.accounts().query("admin").get().stream().map(a -> a._accountId)) + .containsExactly(adminId.get()); + // Query group index + assertThat( + gApi.groups() + .query("Group") + .withOption(MEMBERS) + .get() + .stream() + .flatMap(g -> g.members.stream()) + .map(a -> a._accountId)) + .containsExactly(adminId.get()); } } } From 852e5ac7ac25aa558f1ead5ec541cde5aba364e6 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 5 Jun 2018 17:08:49 +0900 Subject: [PATCH 15/22] Remove unnecessary annotations from reindex test classes AbstractReindexTests doesn't need the @Ignore annotation because it isn't included in the sources glob for the test rule. The concrete *IT classes don't need the @NoHttpd annotation because it's already on the AbstractReindexTests class. Change-Id: Ib3cc3270486bac0b67604af8e97bd92798655af7 --- .../com/google/gerrit/acceptance/pgm/AbstractReindexTests.java | 2 -- .../com/google/gerrit/acceptance/pgm/ElasticReindexIT.java | 2 -- .../test/java/com/google/gerrit/acceptance/pgm/ReindexIT.java | 3 --- 3 files changed, 7 deletions(-) diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/AbstractReindexTests.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/AbstractReindexTests.java index 9242e3f2f1..6e54ae1ae9 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/AbstractReindexTests.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/AbstractReindexTests.java @@ -26,11 +26,9 @@ import com.google.gerrit.extensions.common.ChangeInput; import com.google.gerrit.reviewdb.client.Project; import com.google.inject.Injector; import java.nio.file.Files; -import org.junit.Ignore; import org.junit.Test; @NoHttpd -@Ignore public abstract class AbstractReindexTests extends StandaloneSiteTest { /** @param injector injector */ public abstract void configureIndex(Injector injector) throws Exception; diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java index 683ec91699..d7fcd38273 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java @@ -14,7 +14,6 @@ package com.google.gerrit.acceptance.pgm; -import com.google.gerrit.acceptance.NoHttpd; import com.google.gerrit.elasticsearch.ElasticVersion; import com.google.gerrit.elasticsearch.testing.ElasticContainer; import com.google.gerrit.elasticsearch.testing.ElasticTestUtils; @@ -25,7 +24,6 @@ import java.util.UUID; import org.eclipse.jgit.lib.Config; import org.junit.After; -@NoHttpd public class ElasticReindexIT extends AbstractReindexTests { private static ElasticContainer container; diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ReindexIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ReindexIT.java index 743ccc3dad..b249091284 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ReindexIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/ReindexIT.java @@ -14,12 +14,9 @@ package com.google.gerrit.acceptance.pgm; -import com.google.gerrit.acceptance.NoHttpd; import com.google.inject.Injector; -@NoHttpd public class ReindexIT extends AbstractReindexTests { - @Override public void configureIndex(Injector injector) throws Exception {} } From 0f6c9bd34c92e7001bf45d6bfd5ac0767105c19d Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Tue, 5 Jun 2018 20:38:34 +0200 Subject: [PATCH 16/22] FieldType: Remove unnecessary KEYWORD type Elasticsearch 5 split string type in two: keyword (also known as exact in gerrit index type system) and text (also known as full text in gerrit index type system). During migration from Elasticsearch 2 to 5 exact type was erroneously split in exact and keyword types, that are the same. This reverts commit 506125e71a786f31573e6ba1b1983a4c48cc1dbc. This reverts commit 09fdc3eaadd352b628acfc95c5b74df305b9dbf9. Change-Id: I788e4d06d490687508c4bfd1703037a268fe31a5 --- .../gerrit/elasticsearch/ElasticMapping.java | 16 ++-------------- .../elasticsearch/ElasticQueryAdapter.java | 10 +++++----- .../elasticsearch/ElasticQueryBuilder.java | 2 +- .../gerrit/lucene/AbstractLuceneIndex.java | 2 +- .../com/google/gerrit/lucene/QueryBuilder.java | 2 +- .../com/google/gerrit/server/index/FieldDef.java | 4 ---- .../google/gerrit/server/index/FieldType.java | 3 --- .../gerrit/server/index/group/GroupField.java | 5 ++--- 8 files changed, 12 insertions(+), 32 deletions(-) diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticMapping.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticMapping.java index 599a1689b7..e9f3cb3971 100644 --- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticMapping.java +++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticMapping.java @@ -28,8 +28,6 @@ class ElasticMapping { FieldType fieldType = field.getType(); if (fieldType == FieldType.EXACT) { mapping.addExactField(name); - } else if (fieldType == FieldType.KEYWORD) { - mapping.addKeywordField(name); } else if (fieldType == FieldType.TIMESTAMP) { mapping.addTimestamp(name); } else if (fieldType == FieldType.INTEGER @@ -63,20 +61,10 @@ class ElasticMapping { } Builder addExactField(String name) { - FieldProperties key = new FieldProperties(adapter.keywordFieldType()); + FieldProperties key = new FieldProperties(adapter.exactFieldType()); key.index = adapter.indexProperty(); FieldProperties properties; - properties = new FieldProperties(adapter.stringFieldType()); - properties.fields = ImmutableMap.of("key", key); - fields.put(name, properties); - return this; - } - - Builder addKeywordField(String name) { - FieldProperties key = new FieldProperties(adapter.keywordFieldType()); - key.index = adapter.indexProperty(); - FieldProperties properties; - properties = new FieldProperties(adapter.keywordFieldType()); + properties = new FieldProperties(adapter.exactFieldType()); properties.fields = ImmutableMap.of("key", key); fields.put(name, properties); return this; diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticQueryAdapter.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticQueryAdapter.java index 2ed75df464..72af49a905 100644 --- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticQueryAdapter.java +++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticQueryAdapter.java @@ -20,7 +20,7 @@ public class ElasticQueryAdapter { private final boolean ignoreUnmapped; private final String searchFilteringName; private final String indicesExistParam; - private final String keywordFieldType; + private final String exactFieldType; private final String stringFieldType; private final String indexProperty; @@ -31,7 +31,7 @@ public class ElasticQueryAdapter { case V6_2: this.searchFilteringName = "_source"; this.indicesExistParam = "?allow_no_indices=false"; - this.keywordFieldType = "keyword"; + this.exactFieldType = "keyword"; this.stringFieldType = "text"; this.indexProperty = "true"; break; @@ -39,7 +39,7 @@ public class ElasticQueryAdapter { default: this.searchFilteringName = "fields"; this.indicesExistParam = ""; - this.keywordFieldType = "string"; + this.exactFieldType = "string"; this.stringFieldType = "string"; this.indexProperty = "not_analyzed"; break; @@ -60,8 +60,8 @@ public class ElasticQueryAdapter { return indicesExistParam; } - String keywordFieldType() { - return keywordFieldType; + String exactFieldType() { + return exactFieldType; } String stringFieldType() { diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticQueryBuilder.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticQueryBuilder.java index 13e29e458e..5281ebea93 100644 --- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticQueryBuilder.java +++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/ElasticQueryBuilder.java @@ -94,7 +94,7 @@ public class ElasticQueryBuilder { return intRangeQuery(p); } else if (type == FieldType.TIMESTAMP) { return timestampQuery(p); - } else if (type == FieldType.EXACT || type == FieldType.KEYWORD) { + } else if (type == FieldType.EXACT) { return exactQuery(p); } else if (type == FieldType.PREFIX) { return QueryBuilders.matchPhrasePrefixQuery(name, value); diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/AbstractLuceneIndex.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/AbstractLuceneIndex.java index 607fc904bb..5c3183ad08 100644 --- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/AbstractLuceneIndex.java +++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/AbstractLuceneIndex.java @@ -337,7 +337,7 @@ public abstract class AbstractLuceneIndex implements Index { for (Object value : values.getValues()) { doc.add(new LongField(name, ((Timestamp) value).getTime(), store)); } - } else if (type == FieldType.KEYWORD || type == FieldType.EXACT || type == FieldType.PREFIX) { + } else if (type == FieldType.EXACT || type == FieldType.PREFIX) { for (Object value : values.getValues()) { doc.add(new StringField(name, (String) value, store)); } diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/QueryBuilder.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/QueryBuilder.java index d619a0b01e..74111a0cde 100644 --- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/QueryBuilder.java +++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/QueryBuilder.java @@ -148,7 +148,7 @@ public class QueryBuilder { return intRangeQuery(p); } else if (type == FieldType.TIMESTAMP) { return timestampQuery(p); - } else if (type == FieldType.EXACT || type == FieldType.KEYWORD) { + } else if (type == FieldType.EXACT) { return exactQuery(p); } else if (type == FieldType.PREFIX) { return prefixQuery(p); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/FieldDef.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/FieldDef.java index 3b408a041b..d5f109102f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/FieldDef.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/FieldDef.java @@ -39,10 +39,6 @@ public final class FieldDef { return new FieldDef.Builder<>(FieldType.EXACT, name); } - public static FieldDef.Builder keyword(String name) { - return new FieldDef.Builder<>(FieldType.KEYWORD, name); - } - public static FieldDef.Builder fullText(String name) { return new FieldDef.Builder<>(FieldType.FULL_TEXT, name); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/FieldType.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/FieldType.java index 04c0b4432e..820b62a884 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/FieldType.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/FieldType.java @@ -33,9 +33,6 @@ public class FieldType { /** A string field searched using exact-match semantics. */ public static final FieldType EXACT = new FieldType<>("EXACT"); - /** A Keyword field searched using non-analyzed-match semantics. */ - public static final FieldType KEYWORD = new FieldType<>("KEYWORD"); - /** A string field searched using prefix. */ public static final FieldType PREFIX = new FieldType<>("PREFIX"); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupField.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupField.java index 581b037d97..5e72327487 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupField.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupField.java @@ -17,7 +17,6 @@ package com.google.gerrit.server.index.group; import static com.google.gerrit.server.index.FieldDef.exact; import static com.google.gerrit.server.index.FieldDef.fullText; import static com.google.gerrit.server.index.FieldDef.integer; -import static com.google.gerrit.server.index.FieldDef.keyword; import static com.google.gerrit.server.index.FieldDef.prefix; import com.google.gerrit.reviewdb.client.AccountGroup; @@ -32,11 +31,11 @@ public class GroupField { /** Group UUID. */ public static final FieldDef UUID = - keyword("uuid").stored().build(g -> g.getGroupUUID().get()); + exact("uuid").stored().build(g -> g.getGroupUUID().get()); /** Group owner UUID. */ public static final FieldDef OWNER_UUID = - keyword("owner_uuid").build(g -> g.getOwnerGroupUUID().get()); + exact("owner_uuid").build(g -> g.getOwnerGroupUUID().get()); /** Group name. */ public static final FieldDef NAME = From cc21a0a4702c96f4645aaecef4f1a9822ef3f602 Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Tue, 5 Jun 2018 16:51:59 +0200 Subject: [PATCH 17/22] ChangeNotesTest: Have at most one call after ExpectedException#expect Reported by ErrorProne. Change-Id: I950ed8fa89f2696f5f871d117964bfc1b5f1efc0 Signed-off-by: Edwin Kempin (cherry picked from commit e62121da89447032962976b358e108a9deadf6bd) --- .../java/com/google/gerrit/server/notedb/ChangeNotesTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeNotesTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeNotesTest.java index baa51b724a..0daaee8d12 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeNotesTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeNotesTest.java @@ -3520,9 +3520,9 @@ public class ChangeNotesTest extends AbstractChangeNotesTest { public void setRevertOfOnChildCommitFails() throws Exception { Change c = newChange(); ChangeUpdate update = newUpdate(c, changeOwner); + update.setRevertOf(newChange().getId().get()); exception.expect(OrmException.class); exception.expectMessage("Given ChangeUpdate is only allowed on initial commit"); - update.setRevertOf(newChange().getId().get()); update.commit(); } From edc6a492a8f580cf8e4b74ee637142e659070dfc Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 6 Jun 2018 08:43:46 +0900 Subject: [PATCH 18/22] 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 --- .../UseGerritConfigAnnotationTest.java | 17 ++-- .../UseGlobalPluginConfigAnnotationTest.java | 23 ++--- .../acceptance/rest/config/ServerInfoIT.java | 5 +- .../server/mail/ListMailFilterIT.java | 20 ++-- .../acceptance/ssh/UploadArchiveIT.java | 5 +- .../java/com/google/gerrit/pgm/Daemon.java | 7 +- .../main/java/com/google/gerrit/pgm/Init.java | 12 +-- .../pgm/MigrateAccountPatchReviewDb.java | 5 +- .../java/com/google/gerrit/pgm/Passwd.java | 9 +- .../java/com/google/gerrit/pgm/ProtoGen.java | 11 +-- .../com/google/gerrit/pgm/ProtobufImport.java | 11 +-- .../com/google/gerrit/pgm/RebuildNoteDb.java | 5 +- .../java/com/google/gerrit/pgm/Reindex.java | 5 +- .../java/com/google/gerrit/pgm/Rulec.java | 9 +- .../google/gerrit/pgm/SwitchSecureStore.java | 7 +- .../google/gerrit/pgm/util/SiteProgram.java | 7 +- .../metrics/dropwizard/ListMetrics.java | 9 +- .../gerrit/server/access/ListAccess.java | 9 +- .../gerrit/server/account/GetAvatar.java | 7 +- .../gerrit/server/account/QueryAccounts.java | 27 +++--- .../gerrit/server/change/ChangeEdits.java | 14 ++- .../google/gerrit/server/change/GetBlame.java | 11 +-- .../gerrit/server/change/Mergeable.java | 7 +- .../server/change/SuggestChangeReviewers.java | 7 +- .../server/change/SuggestReviewers.java | 18 ++-- .../gerrit/server/git/ReceiveCommits.java | 54 +++++------ .../gerrit/server/group/ListGroups.java | 76 +++++++-------- .../gerrit/server/group/QueryGroups.java | 25 +++-- .../gerrit/server/plugins/ListPlugins.java | 7 +- .../server/project/CheckMergeability.java | 22 ++--- .../gerrit/server/project/GetReflog.java | 35 ++++--- .../gerrit/server/project/ListBranches.java | 36 ++++--- .../gerrit/server/project/ListProjects.java | 68 ++++++------- .../gerrit/server/project/ListTags.java | 36 ++++--- .../server/query/change/QueryChanges.java | 27 +++--- .../gerrit/sshd/commands/AdminSetParent.java | 39 ++++---- .../gerrit/sshd/commands/AproposCommand.java | 7 +- .../sshd/commands/BanCommitCommand.java | 36 ++++--- .../sshd/commands/BaseTestPrologCommand.java | 14 ++- .../gerrit/sshd/commands/CloseConnection.java | 18 ++-- .../sshd/commands/CreateAccountCommand.java | 16 ++-- .../sshd/commands/CreateBranchCommand.java | 9 +- .../sshd/commands/CreateGroupCommand.java | 36 ++++--- .../sshd/commands/CreateProjectCommand.java | 95 ++++++++----------- .../gerrit/sshd/commands/FlushCaches.java | 7 +- .../commands/GarbageCollectionCommand.java | 11 +-- .../sshd/commands/IndexChangesCommand.java | 11 +-- .../sshd/commands/IndexProjectCommand.java | 11 +-- .../sshd/commands/ListGroupsCommand.java | 20 ++-- .../commands/ListLoggingLevelCommand.java | 7 +- .../sshd/commands/ListMembersCommand.java | 7 +- .../sshd/commands/ListProjectsCommand.java | 7 +- .../gerrit/sshd/commands/LsUserRefs.java | 29 +++--- .../sshd/commands/PluginInstallCommand.java | 7 +- .../google/gerrit/sshd/commands/Query.java | 23 ++--- .../google/gerrit/sshd/commands/Receive.java | 23 ++--- .../sshd/commands/RenameGroupCommand.java | 9 +- .../gerrit/sshd/commands/ReviewCommand.java | 59 +++++------- .../sshd/commands/SetAccountCommand.java | 37 ++++---- .../sshd/commands/SetLoggingLevelCommand.java | 7 +- .../sshd/commands/SetMembersCommand.java | 52 +++++----- .../sshd/commands/SetProjectCommand.java | 70 ++++++-------- .../sshd/commands/SetReviewersCommand.java | 29 +++--- .../gerrit/sshd/commands/ShowCaches.java | 16 ++-- .../gerrit/sshd/commands/ShowConnections.java | 21 ++-- .../gerrit/sshd/commands/ShowQueue.java | 21 ++-- .../gerrit/sshd/commands/StreamEvents.java | 9 +- .../gerrit/sshd/commands/UploadArchive.java | 41 ++++---- 68 files changed, 639 insertions(+), 818 deletions(-) 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 53f1839b17..d5ac2f7845 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 @@ public class UseGerritConfigAnnotationTest extends AbstractDaemonTest { @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 @@ public class UseGerritConfigAnnotationTest extends AbstractDaemonTest { @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 @@ public class UseGerritConfigAnnotationTest extends AbstractDaemonTest { @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 eaa0a95d8b..44d9e4619e 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 @@ public class UseGlobalPluginConfigAnnotationTest extends AbstractDaemonTest { @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 @@ public class UseGlobalPluginConfigAnnotationTest extends AbstractDaemonTest { @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 @@ public class UseGlobalPluginConfigAnnotationTest extends AbstractDaemonTest { @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 f51bbf5f9a..64849a42f9 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 @@ public class ServerInfoIT extends AbstractDaemonTest { // 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 a96c6ece73..ea4f5017ba 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 @@ public class ListMailFilterIT extends AbstractMailIT { @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 @@ public class ListMailFilterIT extends AbstractMailIT { @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 @@ public class ListMailFilterIT extends AbstractMailIT { @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 @@ public class ListMailFilterIT extends AbstractMailIT { @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 bcdc86664e..b8fd95f762 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 @@ public class UploadArchiveIT extends AbstractDaemonTest { @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 467cc9aa49..d6ae6e1c1d 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 @@ public class Daemon extends SiteProgram { 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 6e7e3de8a3..b9c70684dd 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 @@ import org.kohsuke.args4j.Option; /** 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 @@ public class Init extends BaseInit { 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 3feab72a0d..4ace62b77f 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 @@ public class MigrateAccountPatchReviewDb extends SiteProgram { 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 d9c3c5d836..457cae3148 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 @@ public class Passwd extends SiteProgram { 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 f659bb0783..4fe6cf6f93 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 @@ import org.kohsuke.args4j.Option; 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 ad47f0c81b..c11dae15bc 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 @@ import org.kohsuke.args4j.Option; */ 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 d77717e5a9..de8d0cb572 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 @@ public class RebuildNoteDb extends SiteProgram { private List 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 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 232d71b739..d73207b3a2 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 @@ public class Reindex extends SiteProgram { 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 1e542176f1..add06ef11d 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 @@ public class Rulec extends SiteProgram { 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 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 1a2216224c..1cdd8a8b67 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 @@ public class SwitchSecureStore extends SiteProgram { 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 e7f5ffcf7b..e14653a0c1 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 @@ import org.kohsuke.args4j.Option; 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 891f4aca60..8ef1614cad 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 @@ class ListMetrics implements RestReadView { 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 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 024c6107c9..68e787da12 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 @@ import org.kohsuke.args4j.Option; public class ListAccess implements RestReadView { @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 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 0818a0ef80..7ee9112ee7 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 @@ public class GetAvatar implements RestReadView { 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 a8e6dc046d..a2de48177e 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 @@ public class QueryAccounts implements RestReadView { } @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 @@ public class QueryAccounts implements RestReadView { } @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 fbb2115c89..da92964c62 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 @@ public class ChangeEdits 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 @@ public class ChangeEdits 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 d6d0acca0a..1dcdbb8ac5 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 @@ public class GetBlame implements RestReadView { 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 e5f9352bdf..f585e141e9 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 @@ public class Mergeable implements RestReadView { 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 5260730f43..fd14adf5ad 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 @@ public class SuggestChangeReviewers extends SuggestReviewers implements RestReadView { @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 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 47fb5135cd..e1d8f17007 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 @@ public class SuggestReviewers { 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 79e3c12583..47b9960108 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 @@ public class ReceiveCommits { 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 @@ public class ReceiveCommits { 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 @@ public class ReceiveCommits { List 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 @@ public class ReceiveCommits { } @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 @@ public class ReceiveCommits { } @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 9bf14e7126..7b55a80733 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 @@ public class ListGroups implements RestReadView { 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 @@ public class ListGroups implements RestReadView { */ @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 abf464ee68..1b95537306 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 @@ public class QueryGroups implements RestReadView { // 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 5ee06df4da..c95ae85961 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 @@ public class ListPlugins implements RestReadView { 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 f824f81d2d..72ebd62534 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 @@ public class CheckMergeability implements RestReadView { private final Provider 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 5d0afea29e..f51528ddc3 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 @@ public class GetReflog implements RestReadView { 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 522fd7f850..9b46d94abd 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 @@ public class ListBranches implements RestReadView { 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 a84fefd758..8c906ca6af 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 @@ public class ListProjects implements RestReadView { 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 @@ public class ListProjects implements RestReadView { } @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 @@ public class ListProjects implements RestReadView { } @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 @@ public class ListProjects implements RestReadView { } @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 3ebf6fbde4..6090e53848 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 @@ public class ListTags implements RestReadView { 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 370bd21e8d..cc1b95d471 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 @@ public class QueryChanges implements RestReadView { private EnumSet options; @Option( - name = "--query", - aliases = {"-q"}, - metaVar = "QUERY", - usage = "Query string" - ) + name = "--query", + aliases = {"-q"}, + metaVar = "QUERY", + usage = "Query string") private List 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 @@ public class QueryChanges implements RestReadView { } @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 35ddc2a5d1..b7d85079d6 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 @@ import org.slf4j.LoggerFactory; @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 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 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 577b58fec3..d3db70d1db 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 java.util.List; 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 37cc19ea17..51c65c6c0f 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.Argument; 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 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 56ff5eacac..e66422abee 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 @@ abstract class BaseTestPrologCommand extends SshCommand { 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 0e101a900a..4640211059 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 @@ import org.slf4j.LoggerFactory; @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 @@ final class CloseConnection extends SshCommand { @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 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 0c63fb3271..93b56953b0 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 @@ import org.kohsuke.args4j.Option; @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 groups = new ArrayList<>(); @Option(name = "--full-name", metaVar = "NAME", usage = "display name of the account") @@ -59,10 +58,9 @@ final class CreateAccountCommand extends SshCommand { 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 5962faaa32..46cfc9ab4a 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 @@ public final class CreateBranchCommand extends SshCommand { 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 22bca56a6b..1446f84504 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 @@ import org.kohsuke.args4j.Option; @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 @@ final class CreateGroupCommand extends SshCommand { private final Set 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 @@ final class CreateGroupCommand extends SshCommand { private final Set 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 8b323dc656..cfefb7b991 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 @@ import org.kohsuke.args4j.Option; /** 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 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 @@ final class CreateProjectCommand extends SshCommand { 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 @@ final class CreateProjectCommand extends SshCommand { } @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 branch; @Option(name = "--empty-commit", usage = "to create initial empty commit") @@ -162,9 +150,8 @@ final class CreateProjectCommand extends SshCommand { private String maxObjectSizeLimit; @Option( - name = "--plugin-config", - usage = "plugin configuration parameter with format '.='" - ) + name = "--plugin-config", + usage = "plugin configuration parameter with format '.='") private List 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 21bfe9bddf..f2a466d54b 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 @@ import org.kohsuke.args4j.Option; /** 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 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 b0b26faf1d..c4b4d6084b 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 @@ public class GarbageCollectionCommand extends SshCommand { 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 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 fc65cf3733..ce01211915 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 @@ final class IndexChangesCommand extends SshCommand { @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 476c25bfe4..9c8c01cc28 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 @@ final class IndexProjectCommand extends SshCommand { @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 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 8357a919e5..9bb4bd9d7c 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 java.io.PrintWriter; 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 @@ public class ListGroupsCommand extends SshCommand { 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 bb50fb1606..c8b8fa111d 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 @@ import org.kohsuke.args4j.Argument; @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 ca7b18bead..f3f9577b9d 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 @@ import org.kohsuke.args4j.Argument; /** 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 0c3cdcb35b..1face7501e 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 com.google.inject.Inject; 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 5b7f23b75d..f5bb6825da 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 @@ import org.kohsuke.args4j.Option; @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 @@ public class LsUserRefs extends SshCommand { @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 820052c17f..f649c759f8 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 @@ import org.kohsuke.args4j.Option; @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 1192eb5a39..bf607766df 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 @@ class Query extends SshCommand { } @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 @@ class Query extends SshCommand { } @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 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 7789c65e74..8852f0ea1c 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 @@ import org.slf4j.LoggerFactory; /** 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 @@ final class Receive extends AbstractGitCommand { private final Set 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 49b468f072..331405acb5 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 @@ import org.kohsuke.args4j.Argument; @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 ca69b5477d..d038824186 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 @@ public class ReviewCommand extends SshCommand { private final Set 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 @@ public class ReviewCommand extends SshCommand { } @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 @@ public class ReviewCommand extends SshCommand { 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 21591dd038..d8ca77b4cf 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 @@ import org.kohsuke.args4j.Option; 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 @@ final class SetAccountCommand extends SshCommand { private List 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 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 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 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 bea4da138b..cfdd73562c 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 @@ import org.kohsuke.args4j.Argument; @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 ae47175ecb..7d9cf31a81 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.Argument; 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 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 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 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 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 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 20f65ad396..d126b16786 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 @@ final class SetProjectCommand extends SshCommand { 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 @@ final class SetProjectCommand extends SshCommand { 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 @@ final class SetProjectCommand extends SshCommand { } @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 5ea5bf7416..aa060c5c61 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 @@ public class SetReviewersCommand extends SshCommand { 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 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 e16f270119..abca0b896e 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 @@ import org.kohsuke.args4j.Option; /** 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 @@ final class ShowCaches extends SshCommand { @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 071d8a771c..d13a9a5113 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 @@ import org.kohsuke.args4j.Option; /** 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 13db697001..4d1398dd81 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 @@ import org.kohsuke.args4j.Option; /** 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 76d15f7c1e..75157b090a 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 @@ final class StreamEvents extends BaseCommand { 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 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 4b8771a2b9..cafde9931b 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 @@ public class UploadArchive extends AbstractGitCommand { */ 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 / to each filename in the archive.") @@ -93,25 +92,23 @@ public class UploadArchive extends AbstractGitCommand { 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 path; } From 54c04f59b9005cd1c7d9544bad8962bc144cb8e5 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 6 Jun 2018 09:10:11 +0900 Subject: [PATCH 19/22] 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 --- .../UseGerritConfigAnnotationTest.java | 17 ++-- .../UseGlobalPluginConfigAnnotationTest.java | 23 ++--- .../acceptance/api/accounts/AccountIT.java | 5 +- .../acceptance/rest/config/ServerInfoIT.java | 5 +- .../server/mail/ListMailFilterIT.java | 20 ++-- .../acceptance/ssh/UploadArchiveIT.java | 5 +- .../java/com/google/gerrit/pgm/Daemon.java | 14 ++- .../main/java/com/google/gerrit/pgm/Init.java | 12 +-- .../pgm/MigrateAccountPatchReviewDb.java | 5 +- .../google/gerrit/pgm/MigrateToNoteDb.java | 46 ++++----- .../java/com/google/gerrit/pgm/Passwd.java | 9 +- .../java/com/google/gerrit/pgm/ProtoGen.java | 11 +-- .../com/google/gerrit/pgm/ProtobufImport.java | 11 +-- .../java/com/google/gerrit/pgm/Reindex.java | 5 +- .../java/com/google/gerrit/pgm/Rulec.java | 9 +- .../google/gerrit/pgm/SwitchSecureStore.java | 7 +- .../google/gerrit/pgm/util/SiteProgram.java | 7 +- .../metrics/dropwizard/ListMetrics.java | 9 +- .../gerrit/server/access/ListAccess.java | 9 +- .../gerrit/server/account/GetAvatar.java | 7 +- .../gerrit/server/account/QueryAccounts.java | 27 +++--- .../gerrit/server/change/ChangeEdits.java | 14 ++- .../google/gerrit/server/change/GetBlame.java | 11 +-- .../gerrit/server/change/GetPureRevert.java | 7 +- .../gerrit/server/change/Mergeable.java | 7 +- .../server/change/SuggestChangeReviewers.java | 7 +- .../server/change/SuggestReviewers.java | 18 ++-- .../server/git/receive/ReceiveCommits.java | 77 +++++++-------- .../gerrit/server/group/ListGroups.java | 85 ++++++++--------- .../gerrit/server/group/QueryGroups.java | 25 +++-- .../gerrit/server/plugins/ListPlugins.java | 43 ++++----- .../server/project/CheckMergeability.java | 22 ++--- .../gerrit/server/project/GetReflog.java | 35 ++++--- .../gerrit/server/project/ListBranches.java | 36 ++++--- .../gerrit/server/project/ListProjects.java | 68 ++++++------- .../gerrit/server/project/ListTags.java | 36 ++++--- .../server/query/change/QueryChanges.java | 27 +++--- .../gerrit/sshd/commands/AdminSetParent.java | 39 ++++---- .../gerrit/sshd/commands/AproposCommand.java | 7 +- .../sshd/commands/BanCommitCommand.java | 36 ++++--- .../sshd/commands/BaseTestPrologCommand.java | 14 ++- .../gerrit/sshd/commands/CloseConnection.java | 18 ++-- .../sshd/commands/CreateAccountCommand.java | 16 ++-- .../sshd/commands/CreateBranchCommand.java | 9 +- .../sshd/commands/CreateGroupCommand.java | 36 ++++--- .../sshd/commands/CreateProjectCommand.java | 95 ++++++++----------- .../gerrit/sshd/commands/FlushCaches.java | 7 +- .../commands/GarbageCollectionCommand.java | 11 +-- .../sshd/commands/IndexChangesCommand.java | 11 +-- .../sshd/commands/IndexProjectCommand.java | 11 +-- .../sshd/commands/ListGroupsCommand.java | 20 ++-- .../commands/ListLoggingLevelCommand.java | 7 +- .../sshd/commands/ListMembersCommand.java | 7 +- .../sshd/commands/ListProjectsCommand.java | 7 +- .../gerrit/sshd/commands/LsUserRefs.java | 29 +++--- .../sshd/commands/PluginInstallCommand.java | 7 +- .../google/gerrit/sshd/commands/Query.java | 23 ++--- .../google/gerrit/sshd/commands/Receive.java | 23 ++--- .../sshd/commands/RenameGroupCommand.java | 9 +- .../gerrit/sshd/commands/ReviewCommand.java | 54 +++++------ .../sshd/commands/SetAccountCommand.java | 37 ++++---- .../sshd/commands/SetLoggingLevelCommand.java | 7 +- .../sshd/commands/SetMembersCommand.java | 52 +++++----- .../sshd/commands/SetProjectCommand.java | 70 ++++++-------- .../sshd/commands/SetReviewersCommand.java | 29 +++--- .../gerrit/sshd/commands/ShowCaches.java | 16 ++-- .../gerrit/sshd/commands/ShowConnections.java | 21 ++-- .../gerrit/sshd/commands/ShowQueue.java | 21 ++-- .../gerrit/sshd/commands/StreamEvents.java | 9 +- .../gerrit/sshd/commands/UploadArchive.java | 41 ++++---- 70 files changed, 694 insertions(+), 886 deletions(-) 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 53f1839b17..d5ac2f7845 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 @@ public class UseGerritConfigAnnotationTest extends AbstractDaemonTest { @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 @@ public class UseGerritConfigAnnotationTest extends AbstractDaemonTest { @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 @@ public class UseGerritConfigAnnotationTest extends AbstractDaemonTest { @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 eaa0a95d8b..44d9e4619e 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 @@ public class UseGlobalPluginConfigAnnotationTest extends AbstractDaemonTest { @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 @@ public class UseGlobalPluginConfigAnnotationTest extends AbstractDaemonTest { @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 @@ public class UseGlobalPluginConfigAnnotationTest extends AbstractDaemonTest { @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/api/accounts/AccountIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/accounts/AccountIT.java index 15987622e5..a20e62b994 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/accounts/AccountIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/accounts/AccountIT.java @@ -647,9 +647,8 @@ public class AccountIT extends AbstractDaemonTest { @Test @GerritConfig( - name = "auth.registerEmailPrivateKey", - value = "HsOc6l+2lhS9G7sE/RsnS7Z6GJjdRDX14co=" - ) + name = "auth.registerEmailPrivateKey", + value = "HsOc6l+2lhS9G7sE/RsnS7Z6GJjdRDX14co=") public void addEmailSendsConfirmationEmail() throws Exception { String email = "new.email@example.com"; EmailInput input = newEmailInput(email, false); 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 5fdf8bc35c..22f1602684 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 @@ -62,9 +62,8 @@ public class ServerInfoIT extends AbstractDaemonTest { // 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 a96c6ece73..ea4f5017ba 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 @@ public class ListMailFilterIT extends AbstractMailIT { @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 @@ public class ListMailFilterIT extends AbstractMailIT { @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 @@ public class ListMailFilterIT extends AbstractMailIT { @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 @@ public class ListMailFilterIT extends AbstractMailIT { @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 bcdc86664e..b8fd95f762 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 @@ public class UploadArchiveIT extends AbstractDaemonTest { @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 37a2d9024b..3a74bc87e5 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 @@ -162,20 +162,18 @@ public class Daemon extends SiteProgram { 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) private boolean stopOnly; @Option( - name = "--migrate-to-note-db", - usage = "Automatically migrate changes to NoteDb", - handler = ExplicitBooleanOptionHandler.class - ) + name = "--migrate-to-note-db", + usage = "Automatically migrate changes to NoteDb", + handler = ExplicitBooleanOptionHandler.class) private boolean migrateToNoteDb; @Option(name = "--trial", usage = "(With --migrate-to-note-db) " + MigrateToNoteDb.TRIAL_USAGE) 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 6e7e3de8a3..b9c70684dd 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 @@ import org.kohsuke.args4j.Option; /** 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 @@ public class Init extends BaseInit { 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 3feab72a0d..4ace62b77f 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 @@ public class MigrateAccountPatchReviewDb extends SiteProgram { 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/MigrateToNoteDb.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/MigrateToNoteDb.java index 10761c7917..0b44ccfd73 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/MigrateToNoteDb.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/MigrateToNoteDb.java @@ -55,46 +55,42 @@ public class MigrateToNoteDb extends SiteProgram { private Integer threads; @Option( - name = "--project", - usage = - "Only rebuild these projects, do no other migration; incompatible with --change;" - + " recommended for debugging only" - ) + name = "--project", + usage = + "Only rebuild these projects, do no other migration; incompatible with --change;" + + " recommended for debugging only") private List projects = new ArrayList<>(); @Option( - name = "--change", - usage = - "Only rebuild these changes, do no other migration; incompatible with --project;" - + " recommended for debugging only" - ) + name = "--change", + usage = + "Only rebuild these changes, do no other migration; incompatible with --project;" + + " recommended for debugging only") private List changes = new ArrayList<>(); @Option( - name = "--force", - usage = - "Force rebuilding changes where ReviewDb is still the source of truth, even if they" - + " were previously migrated" - ) + name = "--force", + usage = + "Force rebuilding changes where ReviewDb is still the source of truth, even if they" + + " were previously migrated") private boolean force; @Option(name = "--trial", usage = TRIAL_USAGE) private boolean trial; @Option( - name = "--sequence-gap", - usage = - "gap in change sequence numbers between last ReviewDb number and first NoteDb number;" - + " negative indicates using the value of noteDb.changes.initialSequenceGap (default" - + " 1000)" - ) + name = "--sequence-gap", + usage = + "gap in change sequence numbers between last ReviewDb number and first NoteDb number;" + + " negative indicates using the value of noteDb.changes.initialSequenceGap (default" + + " 1000)") private int sequenceGap; @Option( - name = "--reindex", - usage = "Reindex all changes after migration; defaults to false in trial mode, true otherwise", - handler = ExplicitBooleanOptionHandler.class - ) + name = "--reindex", + usage = + "Reindex all changes after migration; defaults to false in trial mode, true otherwise", + handler = ExplicitBooleanOptionHandler.class) private Boolean reindex; private Injector dbInjector; 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 d9c3c5d836..457cae3148 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 @@ public class Passwd extends SiteProgram { 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 f659bb0783..4fe6cf6f93 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 @@ import org.kohsuke.args4j.Option; 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 d97085608a..0732b28217 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 @@ import org.kohsuke.args4j.Option; */ 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/Reindex.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Reindex.java index bee9928153..cdaaf170c5 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 @@ public class Reindex extends SiteProgram { 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 1e542176f1..add06ef11d 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 @@ public class Rulec extends SiteProgram { 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 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 1a2216224c..1cdd8a8b67 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 @@ public class SwitchSecureStore extends SiteProgram { 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 b59e085858..1325b78857 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 @@ import org.kohsuke.args4j.Option; 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 59f6b97a48..012894db7a 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 @@ -39,11 +39,10 @@ class ListMetrics implements RestReadView { 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 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 99e6a9facd..a2cedbfde3 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 @@ -34,11 +34,10 @@ import org.kohsuke.args4j.Option; public class ListAccess implements RestReadView { @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 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 0818a0ef80..7ee9112ee7 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 @@ public class GetAvatar implements RestReadView { 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 e6ac0f69c4..c23e16f682 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 @@ -66,11 +66,10 @@ public class QueryAccounts implements RestReadView { } @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.setUserProvidedLimit(n); @@ -94,21 +93,19 @@ public class QueryAccounts implements RestReadView { } @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 323a31c4f8..2ab2bf8792 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 @@ -380,10 +380,9 @@ public class ChangeEdits private final ProjectCache projectCache; @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 @@ -482,10 +481,9 @@ public class ChangeEdits 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 4702b5a549..4810ca0c76 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 @@ public class GetBlame implements RestReadView { 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/GetPureRevert.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetPureRevert.java index 27c5d49c2f..1afc4b1157 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetPureRevert.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetPureRevert.java @@ -54,10 +54,9 @@ public class GetPureRevert implements RestReadView { private final PatchSetUtil psUtil; @Option( - name = "--claimed-original", - aliases = {"-o"}, - usage = "SHA1 (40 digit hex) of the original commit" - ) + name = "--claimed-original", + aliases = {"-o"}, + usage = "SHA1 (40 digit hex) of the original commit") @Nullable private String claimedOriginal; 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 d1c085a062..a8a297e9ce 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 @@ -55,10 +55,9 @@ public class Mergeable implements RestReadView { 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 1235e63ad6..4d3abb24eb 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 @@ -43,10 +43,9 @@ public class SuggestChangeReviewers extends SuggestReviewers implements RestReadView { @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 PermissionBackend permissionBackend; 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 2ed80718a1..6124f42e11 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 @@ public class SuggestReviewers { 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/receive/ReceiveCommits.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/receive/ReceiveCommits.java index 740c9ab0cc..0afa3bd65f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/receive/ReceiveCommits.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/receive/ReceiveCommits.java @@ -1172,11 +1172,10 @@ class ReceiveCommits { String topic; @Option( - name = "--draft", - usage = - "Will be removed. Before that, this option will be mapped to '--private'" - + "for new changes and '--edit' for existing changes" - ) + name = "--draft", + usage = + "Will be removed. Before that, this option will be mapped to '--private'" + + "for new changes and '--edit' for existing changes") boolean draft; boolean publish; @@ -1188,20 +1187,18 @@ class ReceiveCommits { boolean removePrivate; @Option( - name = "--wip", - aliases = {"-work-in-progress"}, - usage = "mark change as work in progress" - ) + name = "--wip", + aliases = {"-work-in-progress"}, + usage = "mark change as work in progress") boolean workInProgress; @Option(name = "--ready", usage = "mark change as ready") boolean ready; @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") @@ -1214,19 +1211,17 @@ class ReceiveCommits { private boolean publishComments; @Option( - name = "--no-publish-comments", - aliases = {"--np"}, - usage = "do not publish draft comments" - ) + name = "--no-publish-comments", + aliases = {"--np"}, + usage = "do not publish draft comments") private boolean noPublishComments; @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.") private NotifyHandling notify; @Option(name = "--notify-to", metaVar = "USER", usage = "user that should be notified") @@ -1239,11 +1234,10 @@ class ReceiveCommits { List 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); } @@ -1254,11 +1248,10 @@ class ReceiveCommits { } @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 { @@ -1271,11 +1264,10 @@ class ReceiveCommits { } @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(String token) { // Many characters have special meaning in the context of a git ref. // @@ -1293,11 +1285,10 @@ class ReceiveCommits { } @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 910468f6e2..480139deab 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 @@ -90,37 +90,33 @@ public class ListGroups implements RestReadView { 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; } @@ -133,68 +129,61 @@ public class ListGroups implements RestReadView { */ @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 = "--regex", - aliases = {"-r"}, - metaVar = "REGEX", - usage = "match group regex" - ) + name = "--regex", + aliases = {"-r"}, + metaVar = "REGEX", + usage = "match group regex") public void setMatchRegex(String matchRegex) { this.matchRegex = matchRegex; } @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 c5fd2cbb15..bc77f761a0 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 @@ -50,30 +50,27 @@ public class QueryGroups implements RestReadView { // 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 989e839646..ee7cd5c582 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 @@ -47,50 +47,45 @@ public class ListPlugins implements RestReadView { private String matchRegex; @Option( - name = "--all", - aliases = {"-a"}, - usage = "List all plugins, including disabled plugins" - ) + name = "--all", + aliases = {"-a"}, + usage = "List all plugins, including disabled plugins") public void setAll(boolean all) { this.all = all; } @Option( - name = "--limit", - aliases = {"-n"}, - metaVar = "CNT", - usage = "maximum number of plugins to list" - ) + name = "--limit", + aliases = {"-n"}, + metaVar = "CNT", + usage = "maximum number of plugins to list") public void setLimit(int limit) { this.limit = limit; } @Option( - name = "--start", - aliases = {"-S"}, - metaVar = "CNT", - usage = "number of plugins to skip" - ) + name = "--start", + aliases = {"-S"}, + metaVar = "CNT", + usage = "number of plugins to skip") public void setStart(int start) { this.start = start; } @Option( - name = "--prefix", - aliases = {"-p"}, - metaVar = "PREFIX", - usage = "match plugin prefix" - ) + name = "--prefix", + aliases = {"-p"}, + metaVar = "PREFIX", + usage = "match plugin prefix") public void setMatchPrefix(String matchPrefix) { this.matchPrefix = matchPrefix; } @Option( - name = "--match", - aliases = {"-m"}, - metaVar = "MATCH", - usage = "match plugin substring" - ) + name = "--match", + aliases = {"-m"}, + metaVar = "MATCH", + usage = "match plugin substring") public void setMatchSubstring(String matchSubstring) { this.matchSubstring = matchSubstring; } 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 1ab2dbd5b2..ab48143a2c 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 @@ -42,23 +42,21 @@ public class CheckMergeability implements RestReadView { private SubmitType submitType; @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 44d6a4f9dd..81f08731be 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 @@ -42,37 +42,34 @@ public class GetReflog implements RestReadView { 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 b2edc6b77a..9227f3ddde 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 @@ -60,41 +60,37 @@ public class ListBranches implements RestReadView { 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", "-s"}, - metaVar = "CNT", - usage = "number of branches to skip" - ) + name = "--start", + aliases = {"-S", "-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 16585bda25..887dfe3360 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 @@ -152,21 +152,19 @@ public class ListProjects implements RestReadView { 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; } @@ -177,10 +175,9 @@ public class ListProjects implements RestReadView { } @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; } @@ -191,41 +188,37 @@ public class ListProjects implements RestReadView { } @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; } @@ -236,10 +229,9 @@ public class ListProjects implements RestReadView { } @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 d57234aa8f..58ee77da0d 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 @@ -57,41 +57,37 @@ public class ListTags implements RestReadView { 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", "-s"}, - metaVar = "CNT", - usage = "number of tags to skip" - ) + name = "--start", + aliases = {"-S", "-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 8ad0e0b3e4..73bb1d7d4c 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 @@ -42,19 +42,17 @@ public class QueryChanges implements RestReadView { private EnumSet options; @Option( - name = "--query", - aliases = {"-q"}, - metaVar = "QUERY", - usage = "Query string" - ) + name = "--query", + aliases = {"-q"}, + metaVar = "QUERY", + usage = "Query string") private List 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.setUserProvidedLimit(limit); } @@ -70,11 +68,10 @@ public class QueryChanges implements RestReadView { } @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 0d7fa24e42..22eafd6927 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 @@ -45,41 +45,36 @@ import org.slf4j.LoggerFactory; @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 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 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 577b58fec3..d3db70d1db 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 java.util.List; 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 d06f65c49a..3699073d6f 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 @@ -32,34 +32,30 @@ import org.kohsuke.args4j.Argument; 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 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 56ff5eacac..e66422abee 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 @@ abstract class BaseTestPrologCommand extends SshCommand { 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 0e101a900a..4640211059 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 @@ import org.slf4j.LoggerFactory; @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 @@ final class CloseConnection extends SshCommand { @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 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 0c63fb3271..93b56953b0 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 @@ import org.kohsuke.args4j.Option; @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 groups = new ArrayList<>(); @Option(name = "--full-name", metaVar = "NAME", usage = "display name of the account") @@ -59,10 +58,9 @@ final class CreateAccountCommand extends SshCommand { 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 5962faaa32..46cfc9ab4a 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 @@ public final class CreateBranchCommand extends SshCommand { 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 6b5d6323ed..1855f41b13 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 @@ -50,19 +50,17 @@ import org.kohsuke.args4j.Option; @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") @@ -71,11 +69,10 @@ final class CreateGroupCommand extends SshCommand { private final Set 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(Account.Id id) { initialMembers.add(id); } @@ -86,11 +83,10 @@ final class CreateGroupCommand extends SshCommand { private final Set 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(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 0df2a80949..8ccf8645d3 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 @@ import org.kohsuke.args4j.Option; /** 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 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 @@ final class CreateProjectCommand extends SshCommand { 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 @@ final class CreateProjectCommand extends SshCommand { } @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 branch; @Option(name = "--empty-commit", usage = "to create initial empty commit") @@ -162,9 +150,8 @@ final class CreateProjectCommand extends SshCommand { private String maxObjectSizeLimit; @Option( - name = "--plugin-config", - usage = "plugin configuration parameter with format '.='" - ) + name = "--plugin-config", + usage = "plugin configuration parameter with format '.='") private List 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 392fd29d7e..d9c892d6fa 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 @@ -37,10 +37,9 @@ import org.kohsuke.args4j.Option; /** 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 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 b0b26faf1d..c4b4d6084b 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 @@ public class GarbageCollectionCommand extends SshCommand { 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 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 821257c696..b624ee1d3e 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 @@ -34,12 +34,11 @@ final class IndexChangesCommand extends SshCommand { @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 476c25bfe4..9c8c01cc28 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 @@ final class IndexProjectCommand extends SshCommand { @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 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 ac3784a058..59bfa069f4 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 @@ -33,23 +33,21 @@ import java.util.Optional; 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 GroupCache groupCache; @Inject @Options public ListGroups 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; @Override 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 bb50fb1606..c8b8fa111d 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 @@ import org.kohsuke.args4j.Argument; @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 ffaf923b81..568c431bea 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 @@ -37,10 +37,9 @@ import org.kohsuke.args4j.Argument; /** 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 7ef1e2083a..db0929e2c0 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 @@ -24,10 +24,9 @@ import com.google.inject.Inject; 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) public class ListProjectsCommand extends SshCommand { @Inject @Options public 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 275da7cdb5..8927850313 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 @@ -42,10 +42,9 @@ import org.kohsuke.args4j.Option; @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; @Inject private OneOffRequestContext requestContext; @@ -53,21 +52,19 @@ public class LsUserRefs extends SshCommand { @Inject private GitRepositoryManager repoManager; @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 820052c17f..f649c759f8 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 @@ import org.kohsuke.args4j.Option; @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 2e5bf71e08..3fe0396a95 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 @@ public class Query extends SshCommand { } @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 @@ public class Query extends SshCommand { } @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 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 0f68d613c6..262e57a78c 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 @@ -46,9 +46,8 @@ import org.slf4j.LoggerFactory; /** 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); @@ -61,21 +60,19 @@ final class Receive extends AbstractGitCommand { MultimapBuilder.hashKeys(2).hashSetValues().build(); @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(Account.Id id) { reviewers.put(ReviewerStateInternal.REVIEWER, 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(Account.Id id) { reviewers.put(ReviewerStateInternal.CC, 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 6ec3a28e4d..53b6b32c77 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 @@ -30,11 +30,10 @@ import org.kohsuke.args4j.Argument; @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 46d6dcae9c..a6dd0b1bd4 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 @@ -73,12 +73,11 @@ public class ReviewCommand extends SshCommand { private final Set 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(String token) { try { PatchSet ps = psParser.parsePatchSet(token, projectControl, branch); @@ -91,29 +90,26 @@ public class ReviewCommand extends SshCommand { } @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)") @@ -135,19 +131,17 @@ public class ReviewCommand extends SshCommand { private boolean json; @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(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 033b4c6589..f413461688 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 @@ -65,11 +65,10 @@ import org.kohsuke.args4j.Option; 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") @@ -85,34 +84,30 @@ final class SetAccountCommand extends SshCommand { private List 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 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 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 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 bea4da138b..cfdd73562c 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 @@ import org.kohsuke.args4j.Argument; @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 9062b52eeb..84a9f84e31 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 @@ -44,50 +44,44 @@ import org.kohsuke.args4j.Argument; 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 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 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 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 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 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 c275af83b1..6b3fcf2770 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 @@ -35,18 +35,16 @@ final class SetProjectCommand extends SshCommand { 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") @@ -62,37 +60,33 @@ final class SetProjectCommand extends SshCommand { 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; } @@ -103,36 +97,32 @@ final class SetProjectCommand extends SshCommand { } @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 026f9b7aa6..52a790bf01 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 @@ -49,30 +49,27 @@ public class SetReviewersCommand extends SshCommand { 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 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 1ed7db3a44..20e77c7f38 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 @@ -57,10 +57,9 @@ import org.kohsuke.args4j.Option; /** 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; @@ -90,11 +89,10 @@ final class ShowCaches extends SshCommand { @Inject private PermissionBackend permissionBackend; @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 afbdf5d57e..d3bb8feacd 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 @@ import org.kohsuke.args4j.Option; /** 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 0296690d0f..84c460f1dd 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 @@ -45,23 +45,20 @@ import org.kohsuke.args4j.Option; /** 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 PermissionBackend permissionBackend; 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 bdc5f4b5d7..e84221025e 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 @@ final class StreamEvents extends BaseCommand { 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 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 9a3e6aba3e..f90650f9f3 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 @@ -56,15 +56,14 @@ public class UploadArchive extends AbstractGitCommand { */ 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 / to each filename in the archive.") @@ -98,25 +97,23 @@ public class UploadArchive extends AbstractGitCommand { 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 path; } From c65850775c9641d6b9225305048ca94030f6367e Mon Sep 17 00:00:00 2001 From: Gerrit Code Review Date: Wed, 6 Jun 2018 01:24:48 +0000 Subject: [PATCH 20/22] Update git submodules * Update plugins/replication from branch 'stable-2.15' to a62c3c331e11d6477d04b6b3079346f0ea2bcd8f - Merge branch 'stable-2.14' into stable-2.15 * stable-2.14: StartCommand: Reformat with google-java-format 1.6 Change-Id: If85bd54040a37946cbe5aa69a80e43e5feaa6d6c - StartCommand: Reformat with google-java-format 1.6 Change-Id: I3c3420f9951b8060273d88e5bf2bcacce8266ab6 * Update plugins/singleusergroup from branch 'stable-2.15' to 578bc671ec38eba7c2aab38644fd1c4deacad4dd - SingleUserGroupTest: Reformat with google-java-format 1.6 Change-Id: Ief2cf8b9370ea5a2b4cc3e578aa2491ac5ac7ace --- plugins/replication | 2 +- plugins/singleusergroup | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/replication b/plugins/replication index e6092a02c3..a62c3c331e 160000 --- a/plugins/replication +++ b/plugins/replication @@ -1 +1 @@ -Subproject commit e6092a02c3e65130b596ede26a4038c83314bafc +Subproject commit a62c3c331e11d6477d04b6b3079346f0ea2bcd8f diff --git a/plugins/singleusergroup b/plugins/singleusergroup index 94e9edbba4..578bc671ec 160000 --- a/plugins/singleusergroup +++ b/plugins/singleusergroup @@ -1 +1 @@ -Subproject commit 94e9edbba44b5e8c42e7764af924d3ea20835bf2 +Subproject commit 578bc671ec38eba7c2aab38644fd1c4deacad4dd From 881ca772663abd2ac913bd04fe2a91083a183bd6 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 6 Jun 2018 12:14:33 +0900 Subject: [PATCH 21/22] Elasticsearch: Add tests for project queries against version 5 Bug: Issue 6094 Change-Id: I0be93b1597bf2f682a23a900e22bdf513cb888d9 --- .../ElasticV5QueryProjectsTest.java | 73 +++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 javatests/com/google/gerrit/elasticsearch/ElasticV5QueryProjectsTest.java diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV5QueryProjectsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV5QueryProjectsTest.java new file mode 100644 index 0000000000..7b49e1d1e6 --- /dev/null +++ b/javatests/com/google/gerrit/elasticsearch/ElasticV5QueryProjectsTest.java @@ -0,0 +1,73 @@ +// Copyright (C) 2018 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package com.google.gerrit.elasticsearch; + +import com.google.gerrit.elasticsearch.ElasticTestUtils.ElasticNodeInfo; +import com.google.gerrit.server.query.project.AbstractQueryProjectsTest; +import com.google.gerrit.testing.ConfigSuite; +import com.google.gerrit.testing.InMemoryModule; +import com.google.gerrit.testing.IndexConfig; +import com.google.inject.Guice; +import com.google.inject.Injector; +import org.eclipse.jgit.lib.Config; +import org.junit.AfterClass; +import org.junit.BeforeClass; + +public class ElasticV5QueryProjectsTest extends AbstractQueryProjectsTest { + @ConfigSuite.Default + public static Config defaultConfig() { + return IndexConfig.createForElasticsearch(); + } + + private static ElasticNodeInfo nodeInfo; + private static ElasticContainer container; + + @BeforeClass + public static void startIndexService() { + if (nodeInfo != null) { + // do not start Elasticsearch twice + return; + } + + container = ElasticContainer.createAndStart(ElasticVersion.V5_6); + nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort()); + } + + @AfterClass + public static void stopElasticsearchServer() { + if (container != null) { + container.stop(); + } + } + + private String testName() { + return testName.getMethodName().toLowerCase() + "_"; + } + + @Override + protected void initAfterLifecycleStart() throws Exception { + super.initAfterLifecycleStart(); + ElasticTestUtils.createAllIndexes(injector); + } + + @Override + protected Injector createInjector() { + Config elasticsearchConfig = new Config(config); + InMemoryModule.setDefaults(elasticsearchConfig); + String indicesPrefix = testName(); + ElasticTestUtils.configure(elasticsearchConfig, nodeInfo.port, indicesPrefix); + return Guice.createInjector(new InMemoryModule(elasticsearchConfig, notesMigration)); + } +} From bf9e72e6bc03b10375e960f8389e79c74d91e3f9 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 6 Jun 2018 12:35:39 +0900 Subject: [PATCH 22/22] Elasticsearch: Fix parsing of raw fields result for version 5 Elasticsearch 5 returns the results in a "_source" element rather than a "fields" element as in Elasticsearch 2. Add a new method in the adapter and use it in the abstract index. Bug: Issue 6094 Change-Id: Icc8d6f73f86d8abac798efec178f96c0dbf2ae6f --- .../google/gerrit/elasticsearch/AbstractElasticIndex.java | 3 ++- .../google/gerrit/elasticsearch/ElasticQueryAdapter.java | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java b/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java index 1533d86b92..b3a22bc13b 100644 --- a/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java +++ b/java/com/google/gerrit/elasticsearch/AbstractElasticIndex.java @@ -190,7 +190,8 @@ abstract class AbstractElasticIndex implements Index { protected FieldBundle toFieldBundle(JsonObject doc) { Map> allFields = getSchema().getFields(); ListMultimap rawFields = ArrayListMultimap.create(); - for (Map.Entry element : doc.get("fields").getAsJsonObject().entrySet()) { + for (Map.Entry element : + doc.get(client.adapter().rawFieldsKey()).getAsJsonObject().entrySet()) { checkArgument( allFields.containsKey(element.getKey()), "Unrecognized field " + element.getKey()); FieldType type = allFields.get(element.getKey()).getType(); diff --git a/java/com/google/gerrit/elasticsearch/ElasticQueryAdapter.java b/java/com/google/gerrit/elasticsearch/ElasticQueryAdapter.java index 72af49a905..b6cbf2f448 100644 --- a/java/com/google/gerrit/elasticsearch/ElasticQueryAdapter.java +++ b/java/com/google/gerrit/elasticsearch/ElasticQueryAdapter.java @@ -23,6 +23,7 @@ public class ElasticQueryAdapter { private final String exactFieldType; private final String stringFieldType; private final String indexProperty; + private final String rawFieldsKey; ElasticQueryAdapter(ElasticVersion version) { this.ignoreUnmapped = version == ElasticVersion.V2_4; @@ -34,6 +35,7 @@ public class ElasticQueryAdapter { this.exactFieldType = "keyword"; this.stringFieldType = "text"; this.indexProperty = "true"; + this.rawFieldsKey = "_source"; break; case V2_4: default: @@ -42,6 +44,7 @@ public class ElasticQueryAdapter { this.exactFieldType = "string"; this.stringFieldType = "string"; this.indexProperty = "not_analyzed"; + this.rawFieldsKey = "fields"; break; } } @@ -71,4 +74,8 @@ public class ElasticQueryAdapter { String indexProperty() { return indexProperty; } + + String rawFieldsKey() { + return rawFieldsKey; + } }