opendev/gerrit
Code Issues Proposed changes

Format all Java files with google-java-format

Browse Source 
Having a standard tool for formatting saves reviewers' valuable time.
google-java-format is Google's standard formatter and is somewhat
inspired by gofmt[1]. This commit formats everything using
google-java-format version 1.2.

The downside of this one-off formatting is breaking blame. This can be
somewhat hacked around with a tool like git-hyper-blame[2], but it's
definitely not optimal until/unless this kind of feature makes its way
to git core.

Not in this change:
* Tool support, e.g. Eclipse. The command must be run manually [3].
* Documentation of best practice, e.g. new 100-column default.

[1] https://talks.golang.org/2015/gofmt-en.slide#3
[2] https://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/git-hyper-blame.html
[3] git ls-files | grep java$ | xargs google-java-format -i

Change-Id: Id5f3c6de95ce0b68b41f0a478b5c99a93675aaa3
Signed-off-by: David Pursehouse <dpursehouse@collab.net>
This commit is contained in:
Dave Borowitz
2016-11-13 09:56:32 -08:00
committed by David Pursehouse
parent 6723b6d0fa
commit 292fa154c1
2443 changed files with 54816 additions and 57825 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
gerrit-server/src/main/java/com/google/gerrit/server/config/RepositoryConfig.java
View File

@@ -19,13 +19,11 @@ import com.google.gerrit.extensions.client.SubmitType;
import com.google.gerrit.reviewdb.client.Project;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import org.eclipse.jgit.lib.Config;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.jgit.lib.Config;
@Singleton
public class RepositoryConfig {
@@ -43,18 +41,20 @@ public class RepositoryConfig {
}
public SubmitType getDefaultSubmitType(Project.NameKey project) {
return cfg.getEnum(SECTION_NAME, findSubSection(project.get()),
DEFAULT_SUBMIT_TYPE_NAME, SubmitType.MERGE_IF_NECESSARY);
return cfg.getEnum(
SECTION_NAME,
findSubSection(project.get()),
DEFAULT_SUBMIT_TYPE_NAME,
SubmitType.MERGE_IF_NECESSARY);
}
public List<String> getOwnerGroups(Project.NameKey project) {
return ImmutableList.copyOf(cfg.getStringList(SECTION_NAME,
findSubSection(project.get()), OWNER_GROUP_NAME));
return ImmutableList.copyOf(
cfg.getStringList(SECTION_NAME, findSubSection(project.get()), OWNER_GROUP_NAME));
}
public Path getBasePath(Project.NameKey project) {
String basePath = cfg.getString(SECTION_NAME, findSubSection(project.get()),
BASE_PATH_NAME);
String basePath = cfg.getString(SECTION_NAME, findSubSection(project.get()), BASE_PATH_NAME);
return basePath != null ? Paths.get(basePath) : null;
}
@@ -71,10 +71,9 @@ public class RepositoryConfig {
/**
* Find the subSection to get repository configuration from.
* <p>
* SubSection can use the * pattern so if project name matches more than one
* section, return the more precise one. E.g if the following subSections are
* defined:
*
* <p>SubSection can use the * pattern so if project name matches more than one section, return
* the more precise one. E.g if the following subSections are defined:
*
* <pre>
* [repository "somePath/*"]
@@ -83,8 +82,8 @@ public class RepositoryConfig {
* name = value
* </pre>
*
* and this method is called with "somePath/somePath/someProject" as project
* name, it will return the subSection "somePath/somePath/*"
* and this method is called with "somePath/somePath/someProject" as project name, it will return
* the subSection "somePath/somePath/*"
*
* @param project Name of the project
* @return the name of the subSection, null if none is found
@@ -93,8 +92,7 @@ public class RepositoryConfig {
String subSectionFound = null;
for (String subSection : cfg.getSubsections(SECTION_NAME)) {
if (isMatch(subSection, project)
&& (subSectionFound == null || subSectionFound.length() < subSection
.length())) {
&& (subSectionFound == null || subSectionFound.length() < subSection.length())) {
subSectionFound = subSection;
}
}
@@ -103,7 +101,7 @@ public class RepositoryConfig {
private boolean isMatch(String subSection, String project) {
return project.equals(subSection)
|| (subSection.endsWith("*") && project.startsWith(subSection
.substring(0, subSection.length() - 1)));
|| (subSection.endsWith("*")
&& project.startsWith(subSection.substring(0, subSection.length() - 1)));
}
}