From 6a1cfd20c9bf7e34846039cc4e6180368c9d483a Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 18 Apr 2018 10:36:46 +0200 Subject: [PATCH] Upgrade to google-java-format 1.5 Change-Id: I0c72f6c4bc0d0a93605240c2d427c80751b6ccc8 --- java/com/google/gerrit/httpd/raw/StaticModule.java | 4 ++-- .../google/gerrit/pgm/util/LogFileCompressor.java | 2 +- .../gerrit/server/config/ProjectConfigEntry.java | 2 +- .../gerrit/server/notedb/ChangeNotesCache.java | 2 +- .../server/permissions/PermissionCollection.java | 3 ++- .../BooleanProjectConfigTransformations.java | 3 ++- .../server/restapi/project/ListProjects.java | 3 ++- .../gerrit/server/restapi/project/PutConfig.java | 2 +- .../google/gerrit/server/rules/StoredValue.java | 2 +- java/com/google/gerrit/server/schema/MySql.java | 3 ++- .../google/gerrit/server/schema/Schema_105.java | 3 ++- .../google/gerrit/server/update/RepoOnlyOp.java | 2 +- .../sshd/commands/SetLoggingLevelCommand.java | 3 +-- .../gerrit/acceptance/api/change/ChangeIT.java | 6 +++--- .../gerrit/acceptance/ssh/UploadArchiveIT.java | 3 ++- .../extensions/registration/DynamicSetTest.java | 14 +++++++------- .../gerrit/server/patch/IntraLineLoaderTest.java | 10 +++++----- tools/setup_gjf.sh | 2 +- 18 files changed, 37 insertions(+), 32 deletions(-) diff --git a/java/com/google/gerrit/httpd/raw/StaticModule.java b/java/com/google/gerrit/httpd/raw/StaticModule.java index 2cdca13b30..915e9ed101 100644 --- a/java/com/google/gerrit/httpd/raw/StaticModule.java +++ b/java/com/google/gerrit/httpd/raw/StaticModule.java @@ -76,8 +76,8 @@ public class StaticModule extends ServletModule { "/", "/c/*", "/p/*", "/q/*", "/x/*", "/admin/*", "/dashboard/*", "/settings/*"); // TODO(dborowitz): These fragments conflict with the REST API // namespace, so they will need to use a different path. - //"/groups/*", - //"/projects/*"); + // "/groups/*", + // "/projects/*"); // /** diff --git a/java/com/google/gerrit/pgm/util/LogFileCompressor.java b/java/com/google/gerrit/pgm/util/LogFileCompressor.java index de39839de9..8d04be89f3 100644 --- a/java/com/google/gerrit/pgm/util/LogFileCompressor.java +++ b/java/com/google/gerrit/pgm/util/LogFileCompressor.java @@ -67,7 +67,7 @@ public class LogFileCompressor implements Runnable { if (!enabled) { return; } - //compress log once and then schedule compression every day at 11:00pm + // compress log once and then schedule compression every day at 11:00pm queue.getDefaultQueue().execute(compressor); ZoneId zone = ZoneId.systemDefault(); LocalDateTime now = LocalDateTime.now(zone); diff --git a/java/com/google/gerrit/server/config/ProjectConfigEntry.java b/java/com/google/gerrit/server/config/ProjectConfigEntry.java index 39ff327290..4a72ffc64b 100644 --- a/java/com/google/gerrit/server/config/ProjectConfigEntry.java +++ b/java/com/google/gerrit/server/config/ProjectConfigEntry.java @@ -104,7 +104,7 @@ public class ProjectConfigEntry { this(displayName, defaultValue, null); } - //For inheritable boolean use 'LIST' type with InheritableBoolean + // For inheritable boolean use 'LIST' type with InheritableBoolean public ProjectConfigEntry(String displayName, boolean defaultValue, String description) { this( displayName, diff --git a/java/com/google/gerrit/server/notedb/ChangeNotesCache.java b/java/com/google/gerrit/server/notedb/ChangeNotesCache.java index 507b652efe..676dbb8956 100644 --- a/java/com/google/gerrit/server/notedb/ChangeNotesCache.java +++ b/java/com/google/gerrit/server/notedb/ChangeNotesCache.java @@ -268,7 +268,7 @@ public class ChangeNotesCache { + P + ident // author + P - + ident //realAuthor + + ident // realAuthor + P + T // writtenOn + 2 // side diff --git a/java/com/google/gerrit/server/permissions/PermissionCollection.java b/java/com/google/gerrit/server/permissions/PermissionCollection.java index e8e603018c..f103462046 100644 --- a/java/com/google/gerrit/server/permissions/PermissionCollection.java +++ b/java/com/google/gerrit/server/permissions/PermissionCollection.java @@ -132,7 +132,8 @@ public class PermissionCollection { // project closer to the current one come first. sorter.sort(ref, sections); - // For block permissions, we want a different order: first, we want to go from parent to child. + // For block permissions, we want a different order: first, we want to go from parent to + // child. List> accessDescending = Lists.reverse(Lists.newArrayList(sectionToProject.entrySet())); diff --git a/java/com/google/gerrit/server/project/BooleanProjectConfigTransformations.java b/java/com/google/gerrit/server/project/BooleanProjectConfigTransformations.java index 3b75256de6..61a7ef2644 100644 --- a/java/com/google/gerrit/server/project/BooleanProjectConfigTransformations.java +++ b/java/com/google/gerrit/server/project/BooleanProjectConfigTransformations.java @@ -71,7 +71,8 @@ public class BooleanProjectConfigTransformations { .build(); static { - // Verify that each BooleanProjectConfig has to/from API mappers in BooleanProjectConfigTransformations + // Verify that each BooleanProjectConfig has to/from API mappers in + // BooleanProjectConfigTransformations if (!Sets.symmetricDifference( MAPPER.keySet(), new HashSet<>(Arrays.asList(BooleanProjectConfig.values()))) .isEmpty()) { diff --git a/java/com/google/gerrit/server/restapi/project/ListProjects.java b/java/com/google/gerrit/server/restapi/project/ListProjects.java index 9a8232e46b..3407d39547 100644 --- a/java/com/google/gerrit/server/restapi/project/ListProjects.java +++ b/java/com/google/gerrit/server/restapi/project/ListProjects.java @@ -577,7 +577,8 @@ public class ListProjects implements RestReadView { try { // Hidden projects(permitsRead = false) should only be accessible by the project owners. // READ_CONFIG is checked here because it's only allowed to project owners(ACCESS may also - // be allowed for other users). Allowing project owners to access here will help them to view + // be allowed for other users). Allowing project owners to access here will help them to + // view // and update the config of hidden projects easily. ProjectPermission permissionToCheck = state.statePermitsRead() ? ProjectPermission.ACCESS : ProjectPermission.READ_CONFIG; diff --git a/java/com/google/gerrit/server/restapi/project/PutConfig.java b/java/com/google/gerrit/server/restapi/project/PutConfig.java index f118ff2e11..ca7eb0691e 100644 --- a/java/com/google/gerrit/server/restapi/project/PutConfig.java +++ b/java/com/google/gerrit/server/restapi/project/PutConfig.java @@ -200,7 +200,7 @@ public class PutConfig implements RestModifyView { ProjectConfigEntry projectConfigEntry = pluginConfigEntries.get(pluginName, v.getKey()); if (projectConfigEntry != null) { if (!PARAMETER_NAME_PATTERN.matcher(v.getKey()).matches()) { - //TODO check why we have this restriction + // TODO check why we have this restriction log.warn( "Parameter name '{}' must match '{}'", v.getKey(), diff --git a/java/com/google/gerrit/server/rules/StoredValue.java b/java/com/google/gerrit/server/rules/StoredValue.java index c3bc53ffcb..593d47438d 100644 --- a/java/com/google/gerrit/server/rules/StoredValue.java +++ b/java/com/google/gerrit/server/rules/StoredValue.java @@ -58,7 +58,7 @@ public class StoredValue { public T get(Prolog engine) { T obj = getOrNull(engine); if (obj == null) { - //unless createValue() is overridden, will return null + // unless createValue() is overridden, will return null obj = createValue(engine); if (obj == null) { throw new SystemException("No " + key + " available"); diff --git a/java/com/google/gerrit/server/schema/MySql.java b/java/com/google/gerrit/server/schema/MySql.java index f4f19f0d5f..e5f59d7667 100644 --- a/java/com/google/gerrit/server/schema/MySql.java +++ b/java/com/google/gerrit/server/schema/MySql.java @@ -41,7 +41,8 @@ class MySql extends BaseDataSourceType { b.append(port(dbs.optional("port"))); b.append("/"); b.append(dbs.required("database")); - // See https://stackoverflow.com/questions/42084633/table-name-pattern-can-not-be-null-or-empty-in-java + // See + // https://stackoverflow.com/questions/42084633/table-name-pattern-can-not-be-null-or-empty-in-java b.append("?nullNamePatternMatchesAll=true"); return b.toString(); } diff --git a/java/com/google/gerrit/server/schema/Schema_105.java b/java/com/google/gerrit/server/schema/Schema_105.java index 78ecdbdf04..dd5e71a7fd 100644 --- a/java/com/google/gerrit/server/schema/Schema_105.java +++ b/java/com/google/gerrit/server/schema/Schema_105.java @@ -66,7 +66,8 @@ public class Schema_105 extends SchemaVersion { private Set listChangesIndexes(JdbcSchema schema) throws SQLException { // List of all changes indexes ever created or dropped, found with the // following command: - // find g* -name \*.sql | xargs git log -i -p -S' index changes_' | grep -io ' index changes_\w*' | cut -d' ' -f3 | tr A-Z a-z | sort -u + // find g* -name \*.sql | xargs git log -i -p -S' index changes_' | grep -io ' index + // changes_\w*' | cut -d' ' -f3 | tr A-Z a-z | sort -u // Used rather than listIndexes as we're not sure whether it might include // primary key indexes. Set allChanges = diff --git a/java/com/google/gerrit/server/update/RepoOnlyOp.java b/java/com/google/gerrit/server/update/RepoOnlyOp.java index 10a6a31f92..7e9c47eff7 100644 --- a/java/com/google/gerrit/server/update/RepoOnlyOp.java +++ b/java/com/google/gerrit/server/update/RepoOnlyOp.java @@ -34,6 +34,6 @@ public interface RepoOnlyOp { * * @param ctx context */ - //TODO(dborowitz): Support async operations? + // TODO(dborowitz): Support async operations? default void postUpdate(Context ctx) throws Exception {} } diff --git a/java/com/google/gerrit/sshd/commands/SetLoggingLevelCommand.java b/java/com/google/gerrit/sshd/commands/SetLoggingLevelCommand.java index 4957a60fd8..bea4da138b 100644 --- a/java/com/google/gerrit/sshd/commands/SetLoggingLevelCommand.java +++ b/java/com/google/gerrit/sshd/commands/SetLoggingLevelCommand.java @@ -66,8 +66,7 @@ public class SetLoggingLevelCommand extends SshCommand { reset(); } else { for (Enumeration logger = LogManager.getCurrentLoggers(); - logger.hasMoreElements(); - ) { + logger.hasMoreElements(); ) { Logger log = logger.nextElement(); if (name == null || log.getName().contains(name)) { log.setLevel(Level.toLevel(level.name())); diff --git a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java index 02bd0300d9..f48579fc25 100644 --- a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java +++ b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java @@ -1588,7 +1588,7 @@ public class ChangeIT extends AbstractDaemonTest { String oldETag = rsrc.getETag(); Timestamp oldTs = rsrc.getChange().getLastUpdatedOn(); - //create a group named "ab" with one user: testUser + // create a group named "ab" with one user: testUser TestAccount testUser = accountCreator.create("abcd", "abcd@test.com", "abcd"); String testGroup = createGroupWithRealName("ab"); GroupApi groupApi = gApi.groups().id(testGroup); @@ -1632,7 +1632,7 @@ public class ChangeIT extends AbstractDaemonTest { String oldETag = rsrc.getETag(); Timestamp oldTs = rsrc.getChange().getLastUpdatedOn(); - //create a group named "kobe" with one user: lee + // create a group named "kobe" with one user: lee TestAccount testUser = accountCreator.create("kobebryant", "kobebryant@test.com", "kobebryant"); TestAccount myGroupUser = accountCreator.create("lee", "lee@test.com", "lee"); @@ -1641,7 +1641,7 @@ public class ChangeIT extends AbstractDaemonTest { groupApi.description("test group"); groupApi.addMembers(myGroupUser.fullName); - //ensure that user "user" is not in the group + // ensure that user "user" is not in the group groupApi.removeMembers(testUser.fullName); AddReviewerInput in = new AddReviewerInput(); diff --git a/javatests/com/google/gerrit/acceptance/ssh/UploadArchiveIT.java b/javatests/com/google/gerrit/acceptance/ssh/UploadArchiveIT.java index aa7a987ef5..95c585dc45 100644 --- a/javatests/com/google/gerrit/acceptance/ssh/UploadArchiveIT.java +++ b/javatests/com/google/gerrit/acceptance/ssh/UploadArchiveIT.java @@ -121,7 +121,8 @@ public class UploadArchiveIT extends AbstractDaemonTest { // Make sure the next one is not on the error channel packet = in.readString(); - // 1 = DATA. It would be nicer to parse the OutputStream with SideBandInputStream from JGit, but + // 1 = DATA. It would be nicer to parse the OutputStream with SideBandInputStream from JGit, + // but // that is currently not public. char channel = packet.charAt(0); if (channel != 1) { diff --git a/javatests/com/google/gerrit/extensions/registration/DynamicSetTest.java b/javatests/com/google/gerrit/extensions/registration/DynamicSetTest.java index b6ff156dcf..117e4744cd 100644 --- a/javatests/com/google/gerrit/extensions/registration/DynamicSetTest.java +++ b/javatests/com/google/gerrit/extensions/registration/DynamicSetTest.java @@ -34,7 +34,7 @@ public class DynamicSetTest { @Test public void containsWithEmpty() throws Exception { DynamicSet ds = new DynamicSet<>(); - assertThat(ds.contains(2)).isFalse(); //See above comment about ds.contains + assertThat(ds.contains(2)).isFalse(); // See above comment about ds.contains } @Test @@ -42,7 +42,7 @@ public class DynamicSetTest { DynamicSet ds = new DynamicSet<>(); ds.add(2); - assertThat(ds.contains(2)).isTrue(); //See above comment about ds.contains + assertThat(ds.contains(2)).isTrue(); // See above comment about ds.contains } @Test @@ -50,7 +50,7 @@ public class DynamicSetTest { DynamicSet ds = new DynamicSet<>(); ds.add(2); - assertThat(ds.contains(3)).isFalse(); //See above comment about ds.contains + assertThat(ds.contains(3)).isFalse(); // See above comment about ds.contains } @Test @@ -59,7 +59,7 @@ public class DynamicSetTest { ds.add(2); ds.add(4); - assertThat(ds.contains(4)).isTrue(); //See above comment about ds.contains + assertThat(ds.contains(4)).isTrue(); // See above comment about ds.contains } @Test @@ -68,7 +68,7 @@ public class DynamicSetTest { ds.add(2); ds.add(4); - assertThat(ds.contains(3)).isFalse(); //See above comment about ds.contains + assertThat(ds.contains(3)).isFalse(); // See above comment about ds.contains } @Test @@ -82,12 +82,12 @@ public class DynamicSetTest { ds.add(6); // At first, 4 is contained. - assertThat(ds.contains(4)).isTrue(); //See above comment about ds.contains + assertThat(ds.contains(4)).isTrue(); // See above comment about ds.contains // Then we remove 4. handle.remove(); // And now 4 should no longer be contained. - assertThat(ds.contains(4)).isFalse(); //See above comment about ds.contains + assertThat(ds.contains(4)).isFalse(); // See above comment about ds.contains } } diff --git a/javatests/com/google/gerrit/server/patch/IntraLineLoaderTest.java b/javatests/com/google/gerrit/server/patch/IntraLineLoaderTest.java index 2b660ed52a..ef80d7ef33 100644 --- a/javatests/com/google/gerrit/server/patch/IntraLineLoaderTest.java +++ b/javatests/com/google/gerrit/server/patch/IntraLineLoaderTest.java @@ -77,14 +77,14 @@ public class IntraLineLoaderTest { String b = "multi\nlinemulti\nline\n"; assertThat(intraline(a, b)).isEqualTo(wordEdit(10, 10, 6, 16)); // better would be: - //assertThat(intraline(a, b)).isEqualTo(wordEdit(6, 6, 6, 16)); + // assertThat(intraline(a, b)).isEqualTo(wordEdit(6, 6, 6, 16)); // or the equivalent: - //assertThat(intraline(a, b)).isEqualTo(ref() + // assertThat(intraline(a, b)).isEqualTo(ref() // .common("multi\n").insert("linemulti\n").common("line\n").edits - //); + // ); } - //TODO: expected failure + // TODO: expected failure // the current code does not work on the first line // and the insert marker is in the wrong location @Test(expected = AssertionError.class) @@ -95,7 +95,7 @@ public class IntraLineLoaderTest { .isEqualTo(ref().insert(" ").common(" abc\n").insert(" ").common(" def\n").edits); } - //TODO: expected failure + // TODO: expected failure // the current code does not work on the first line @Test(expected = AssertionError.class) public void preferDeleteAtLineBreak() throws Exception { diff --git a/tools/setup_gjf.sh b/tools/setup_gjf.sh index b3ac143744..9c36c72ff3 100755 --- a/tools/setup_gjf.sh +++ b/tools/setup_gjf.sh @@ -17,7 +17,7 @@ set -eu # Keep this version in sync with dev-contributing.txt. -VERSION=${1:-1.3} +VERSION=${1:-1.5} case "$VERSION" in 1.3)