Merge "Format with google-java-format"
diff --git a/src/main/java/com/googlesource/gerrit/plugins/automerger/QueryBuilder.java b/src/main/java/com/googlesource/gerrit/plugins/automerger/QueryBuilder.java
index fae69b4..2aa0ba9 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/automerger/QueryBuilder.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/automerger/QueryBuilder.java
@@ -26,7 +26,7 @@
public QueryBuilder() {
this.queryStringMap = new HashMap<String, String>();
}
-
+
public void addParameter(String key, String value) throws InvalidQueryParameterException {
if (value.contains("\"") && (value.contains("{") || value.contains("}"))) {
// Gerrit does not support search string escaping as of 5/16/2017
@@ -39,7 +39,7 @@
queryStringMap.put(key, "\"" + value + "\"");
}
}
-
+
public String removeParameter(String key) {
return queryStringMap.remove(key);
}
diff --git a/src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorIT.java b/src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorIT.java
index f79d3d5..cf42a56 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorIT.java
@@ -216,7 +216,6 @@
.create(db, admin.getIdent(), testRepo, "subject", "filename", "echo 'Hello World!'")
.to("refs/for/master");
masterResult.assertOkStatus();
-
// Since there's a conflict with ds_one, there should only be two changes in the topic
List<ChangeInfo> changesInTopic =
