opendev/gerrit
Code Issues Proposed changes

Format Java files with google-java-format

Browse Source 
Change-Id: I699e80c4eb5876501dad147046ab5c9c2f34e221
This commit is contained in:
David Pursehouse
2017-03-31 14:27:07 +09:00
parent 8f34f0df38
commit 37d10baf4a
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AssigneeIT.java
View File

@@ -35,7 +35,6 @@ import com.google.gerrit.testutil.FakeEmailSender.Message;
import com.google.gerrit.testutil.TestTimeUtil; import com.google.gerrit.testutil.TestTimeUtil;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import org.eclipse.jgit.transport.RefSpec; import org.eclipse.jgit.transport.RefSpec;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.BeforeClass; import org.junit.BeforeClass;

5
gerrit-gwtui/src/main/java/com/google/gerrit/client/api/PluginLoader.java
View File

@@ -39,10 +39,7 @@ public class PluginLoader extends DialogBox {
if (plugins == null || plugins.isEmpty()) { if (plugins == null || plugins.isEmpty()) {
callback.onSuccess(VoidResult.create()); callback.onSuccess(VoidResult.create());
} }
plugins = plugins plugins = plugins.stream().filter(p -> p.endsWith(".js")).collect(Collectors.toList());
.stream()
.filter(p -> p.endsWith(".js"))
.collect(Collectors.toList());
if (plugins.isEmpty()) { if (plugins.isEmpty()) {
callback.onSuccess(VoidResult.create()); callback.onSuccess(VoidResult.create());
} else { } else {

4
gerrit-server/src/main/java/com/google/gerrit/server/config/GetServerInfo.java
View File

@@ -311,8 +311,8 @@ public class GetServerInfo implements RestReadView<ConfigResource> {
info.jsResourcePaths = new ArrayList<>(); info.jsResourcePaths = new ArrayList<>();
info.htmlResourcePaths = new ArrayList<>(); info.htmlResourcePaths = new ArrayList<>();
for (WebUiPlugin u : plugins) { for (WebUiPlugin u : plugins) {
String path = String.format( String path =
"plugins/%s/%s", u.getPluginName(), u.getJavaScriptResourcePath()); String.format("plugins/%s/%s", u.getPluginName(), u.getJavaScriptResourcePath());
if (path.endsWith(".html")) { if (path.endsWith(".html")) {
info.htmlResourcePaths.add(path); info.htmlResourcePaths.add(path);
} else { } else {