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

39
gerrit-httpd/src/test/java/com/google/gerrit/httpd/AllRequestFilterFilterProxyTest.java
View File

@@ -25,25 +25,22 @@ import com.google.gerrit.util.http.testutil.FakeHttpServletRequest;
import com.google.gerrit.util.http.testutil.FakeHttpServletResponse;
import com.google.inject.Key;
import com.google.inject.util.Providers;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.easymock.Capture;
import org.easymock.EasyMockSupport;
import org.easymock.IMocksControl;
import org.junit.Before;
import org.junit.Test;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
public class AllRequestFilterFilterProxyTest {
/**
* Set of filters for FilterProxy
* <p/>
* This set is used to as set of filters when fetching an
* {@link AllRequestFilter.FilterProxy} instance through
* {@link #getFilterProxy()}.
*
* <p>This set is used to as set of filters when fetching an {@link AllRequestFilter.FilterProxy}
* instance through {@link #getFilterProxy()}.
*/
private DynamicSet<AllRequestFilter> filters;
@@ -63,9 +60,9 @@ public class AllRequestFilterFilterProxyTest {
/**
* Obtain a FilterProxy with a known DynamicSet of filters
* <p/>
* The returned {@link AllRequestFilter.FilterProxy} can have new filters
* added dynamically by calling {@link #addFilter(AllRequestFilter)}.
*
* <p>The returned {@link AllRequestFilter.FilterProxy} can have new filters added dynamically by
* calling {@link #addFilter(AllRequestFilter)}.
*/
private AllRequestFilter.FilterProxy getFilterProxy() {
return new AllRequestFilter.FilterProxy(filters);
@@ -73,13 +70,11 @@ public class AllRequestFilterFilterProxyTest {
/**
* Add a filter to created FilterProxy instances
* <p/>
* This method adds the given filter to all
* {@link AllRequestFilter.FilterProxy} instances created by
* {@link #getFilterProxy()}.
*
* <p>This method adds the given filter to all {@link AllRequestFilter.FilterProxy} instances
* created by {@link #getFilterProxy()}.
*/
private ReloadableRegistrationHandle<AllRequestFilter> addFilter(
final AllRequestFilter filter) {
private ReloadableRegistrationHandle<AllRequestFilter> addFilter(final AllRequestFilter filter) {
Key<AllRequestFilter> key = Key.get(AllRequestFilter.class);
return filters.add(key, Providers.of(filter));
}
@@ -333,10 +328,8 @@ public class AllRequestFilterFilterProxyTest {
ems.replayAll();
AllRequestFilter.FilterProxy filterProxy = getFilterProxy();
ReloadableRegistrationHandle<AllRequestFilter> handleFilterA =
addFilter(filterA);
ReloadableRegistrationHandle<AllRequestFilter> handleFilterB =
addFilter(filterB);
ReloadableRegistrationHandle<AllRequestFilter> handleFilterA = addFilter(filterA);
ReloadableRegistrationHandle<AllRequestFilter> handleFilterB = addFilter(filterB);
filterProxy.init(config);

6
gerrit-httpd/src/test/java/com/google/gerrit/httpd/RemoteUserUtilTest.java
View File

@@ -24,9 +24,7 @@ public class RemoteUserUtilTest {
public void testExtractUsername() {
assertThat(extractUsername(null)).isNull();
assertThat(extractUsername("")).isNull();
assertThat(extractUsername("Basic dXNlcjpwYXNzd29yZA=="))
.isEqualTo("user");
assertThat(extractUsername("Digest username=\"user\", realm=\"test\""))
.isEqualTo("user");
assertThat(extractUsername("Basic dXNlcjpwYXNzd29yZA==")).isEqualTo("user");
assertThat(extractUsername("Digest username=\"user\", realm=\"test\"")).isEqualTo("user");
}
}

23
gerrit-httpd/src/test/java/com/google/gerrit/httpd/plugins/ContextMapperTest.java
View File

@@ -17,10 +17,8 @@ package com.google.gerrit.httpd.plugins;
import static com.google.common.truth.Truth.assertThat;
import com.google.gerrit.util.http.testutil.FakeHttpServletRequest;
import org.junit.Test;
import javax.servlet.http.HttpServletRequest;
import org.junit.Test;
public class ContextMapperTest {
@@ -35,11 +33,9 @@ public class ContextMapperTest {
HttpServletRequest originalRequest =
createFakeRequest("/plugins/", PLUGIN_NAME + "/" + RESOURCE);
HttpServletRequest result =
classUnderTest.create(originalRequest, PLUGIN_NAME);
HttpServletRequest result = classUnderTest.create(originalRequest, PLUGIN_NAME);
assertThat(result.getContextPath())
.isEqualTo(CONTEXT + "/plugins/" + PLUGIN_NAME);
assertThat(result.getContextPath()).isEqualTo(CONTEXT + "/plugins/" + PLUGIN_NAME);
assertThat(result.getServletPath()).isEqualTo("");
assertThat(result.getPathInfo()).isEqualTo("/" + RESOURCE);
assertThat(result.getRequestURI())
@@ -53,20 +49,17 @@ public class ContextMapperTest {
HttpServletRequest originalRequest =
createFakeRequest("/a/plugins/", PLUGIN_NAME + "/" + RESOURCE);
HttpServletRequest result =
classUnderTest.create(originalRequest, PLUGIN_NAME);
HttpServletRequest result = classUnderTest.create(originalRequest, PLUGIN_NAME);
assertThat(result.getContextPath())
.isEqualTo(CONTEXT + "/a/plugins/" + PLUGIN_NAME);
assertThat(result.getContextPath()).isEqualTo(CONTEXT + "/a/plugins/" + PLUGIN_NAME);
assertThat(result.getServletPath()).isEqualTo("");
assertThat(result.getPathInfo()).isEqualTo("/" + RESOURCE);
assertThat(result.getRequestURI())
.isEqualTo(CONTEXT + "/a/plugins/" + PLUGIN_NAME + "/" + RESOURCE);
}
private static FakeHttpServletRequest createFakeRequest(String servletPath,
String pathInfo) {
return new FakeHttpServletRequest(
"gerrit.example.com", 80, CONTEXT, servletPath).setPathInfo(pathInfo);
private static FakeHttpServletRequest createFakeRequest(String servletPath, String pathInfo) {
return new FakeHttpServletRequest("gerrit.example.com", 80, CONTEXT, servletPath)
.setPathInfo(pathInfo);
}
}

3
gerrit-httpd/src/test/java/com/google/gerrit/httpd/plugins/LfsPluginServletTest.java
View File

@@ -16,10 +16,9 @@ package com.google.gerrit.httpd.plugins;
import static com.google.common.truth.Truth.assertThat;
import org.junit.Test;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.junit.Test;
public class LfsPluginServletTest {

53
gerrit-httpd/src/test/java/com/google/gerrit/httpd/raw/ResourceServletTest.java
View File

@@ -30,11 +30,6 @@ import com.google.common.jimfs.Jimfs;
import com.google.gerrit.httpd.raw.ResourceServlet.Resource;
import com.google.gerrit.util.http.testutil.FakeHttpServletRequest;
import com.google.gerrit.util.http.testutil.FakeHttpServletResponse;
import org.joda.time.format.ISODateTimeFormat;
import org.junit.Before;
import org.junit.Test;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.nio.file.FileSystem;
@@ -43,13 +38,13 @@ import java.nio.file.Path;
import java.nio.file.attribute.FileTime;
import java.util.concurrent.atomic.AtomicLong;
import java.util.zip.GZIPInputStream;
import org.joda.time.format.ISODateTimeFormat;
import org.junit.Before;
import org.junit.Test;
public class ResourceServletTest {
private static Cache<Path, Resource> newCache(int size) {
return CacheBuilder.newBuilder()
.maximumSize(size)
.recordStats()
.build();
return CacheBuilder.newBuilder().maximumSize(size).recordStats().build();
}
private static class Servlet extends ResourceServlet {
@@ -57,26 +52,29 @@ public class ResourceServletTest {
private final FileSystem fs;
private Servlet(FileSystem fs, Cache<Path, Resource> cache,
boolean refresh) {
private Servlet(FileSystem fs, Cache<Path, Resource> cache, boolean refresh) {
super(cache, refresh);
this.fs = fs;
}
private Servlet(FileSystem fs, Cache<Path, Resource> cache,
boolean refresh, boolean cacheOnClient) {
private Servlet(
FileSystem fs, Cache<Path, Resource> cache, boolean refresh, boolean cacheOnClient) {
super(cache, refresh, cacheOnClient);
this.fs = fs;
}
private Servlet(FileSystem fs, Cache<Path, Resource> cache,
boolean refresh, int cacheFileSizeLimitBytes) {
private Servlet(
FileSystem fs, Cache<Path, Resource> cache, boolean refresh, int cacheFileSizeLimitBytes) {
super(cache, refresh, true, cacheFileSizeLimitBytes);
this.fs = fs;
}
private Servlet(FileSystem fs, Cache<Path, Resource> cache,
boolean refresh, boolean cacheOnClient, int cacheFileSizeLimitBytes) {
private Servlet(
FileSystem fs,
Cache<Path, Resource> cache,
boolean refresh,
boolean cacheOnClient,
int cacheFileSizeLimitBytes) {
super(cache, refresh, cacheOnClient, cacheFileSizeLimitBytes);
this.fs = fs;
}
@@ -93,8 +91,7 @@ public class ResourceServletTest {
@Before
public void setUp() {
fs = Jimfs.newFileSystem(Configuration.unix());
ts = new AtomicLong(ISODateTimeFormat.dateTime().parseMillis(
"2010-01-30T12:00:00.000-08:00"));
ts = new AtomicLong(ISODateTimeFormat.dateTime().parseMillis("2010-01-30T12:00:00.000-08:00"));
}
@Test
@@ -237,8 +234,7 @@ public class ResourceServletTest {
Servlet servlet = new Servlet(fs, cache, true);
writeFile("/foo", "foo1");
FakeHttpServletRequest req = request("/foo")
.addHeader("Accept-Encoding", "gzip");
FakeHttpServletRequest req = request("/foo").addHeader("Accept-Encoding", "gzip");
FakeHttpServletResponse res = new FakeHttpServletResponse();
servlet.doGet(req, res);
assertThat(res.getStatus()).isEqualTo(SC_OK);
@@ -255,8 +251,7 @@ public class ResourceServletTest {
String content = Strings.repeat("a", 100);
writeFile("/foo", content);
FakeHttpServletRequest req = request("/foo")
.addHeader("Accept-Encoding", "gzip");
FakeHttpServletRequest req = request("/foo").addHeader("Accept-Encoding", "gzip");
FakeHttpServletResponse res = new FakeHttpServletResponse();
servlet.doGet(req, res);
assertThat(res.getStatus()).isEqualTo(SC_OK);
@@ -267,8 +262,7 @@ public class ResourceServletTest {
}
@Test
public void largeFileBypassesCacheRegardlessOfRefreshParamter()
throws Exception {
public void largeFileBypassesCacheRegardlessOfRefreshParamter() throws Exception {
for (boolean refresh : Lists.newArrayList(true, false)) {
Cache<Path, Resource> cache = newCache(1);
Servlet servlet = new Servlet(fs, cache, refresh, 3);
@@ -312,8 +306,7 @@ public class ResourceServletTest {
String content = Strings.repeat("a", 100);
writeFile("/foo", content);
FakeHttpServletRequest req = request("/foo")
.addHeader("Accept-Encoding", "gzip");
FakeHttpServletRequest req = request("/foo").addHeader("Accept-Encoding", "gzip");
FakeHttpServletResponse res = new FakeHttpServletResponse();
servlet.doGet(req, res);
assertThat(res.getStatus()).isEqualTo(SC_OK);
@@ -331,8 +324,7 @@ public class ResourceServletTest {
private void writeFile(String path, String content) throws Exception {
Files.write(fs.getPath(path), content.getBytes(UTF_8));
Files.setLastModifiedTime(
fs.getPath(path), FileTime.fromMillis(ts.getAndIncrement()));
Files.setLastModifiedTime(fs.getPath(path), FileTime.fromMillis(ts.getAndIncrement()));
}
private static void assertCacheHits(Cache<?, ?> cache, int hits, int misses) {
@@ -340,8 +332,7 @@ public class ResourceServletTest {
assertThat(cache.stats().missCount()).named("misses").isEqualTo(misses);
}
private static void assertCacheable(FakeHttpServletResponse res,
boolean revalidate) {
private static void assertCacheable(FakeHttpServletResponse res, boolean revalidate) {
String header = res.getHeader("Cache-Control").toLowerCase();
assertThat(header).contains("public");
if (revalidate) {

16
gerrit-httpd/src/test/java/com/google/gerrit/httpd/restapi/ParameterParserTest.java
View File

@@ -22,19 +22,19 @@ import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.google.gson.JsonPrimitive;
import org.junit.Test;
public class ParameterParserTest {
@Test
public void convertFormToJson() throws BadRequestException {
JsonObject obj = ParameterParser.formToJson(
ImmutableMap.of(
"message", new String[]{"this.is.text"},
"labels.Verified", new String[]{"-1"},
"labels.Code-Review", new String[]{"2"},
"a_list", new String[]{"a", "b"}),
ImmutableSet.of("q"));
JsonObject obj =
ParameterParser.formToJson(
ImmutableMap.of(
"message", new String[] {"this.is.text"},
"labels.Verified", new String[] {"-1"},
"labels.Code-Review", new String[] {"2"},
"a_list", new String[] {"a", "b"}),
ImmutableSet.of("q"));
JsonObject labels = new JsonObject();
labels.addProperty("Verified", "-1");