summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse <david.pursehouse@sonymobile.com>2016-05-03 22:52:30 +0900
committerDavid Pursehouse <david.pursehouse@sonymobile.com>2016-05-04 07:38:12 +0900
commita3f93741618e2bef903f9140dd15d66b5cc4f018 (patch)
treec164f5d601a379524ab52f217d3b3cb349dddd43
parent8db7117d509498c7d88979034afbc67220d75f6c (diff)
Use native constructors instead of Guava to instantiate empty collections
It's not necessary to use Guava's helper methods when instantiating empty collections. Just use the native constructors. Change-Id: If301228245c9c6efe581baa6144fb72c6cc97738
-rw-r--r--src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java10
-rw-r--r--src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationQueue.java4
2 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java b/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java
index f8bb534..af8bdc7 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/PushOne.java
@@ -19,8 +19,6 @@ import static java.util.concurrent.TimeUnit.NANOSECONDS;
import com.google.common.base.Throwables;
import com.google.common.collect.LinkedListMultimap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import com.google.common.collect.Multimap;
import com.google.common.collect.Sets;
import com.google.gerrit.extensions.events.GitReferenceUpdatedListener;
@@ -65,8 +63,10 @@ import org.eclipse.jgit.transport.URIish;
import org.slf4j.MDC;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -418,7 +418,7 @@ class PushOne implements ProjectRunnable {
// If we aren't mirroring, reduce the space we need to filter
// to only the references we will update during this operation.
//
- Map<String, Ref> n = Maps.newHashMap();
+ Map<String, Ref> n = new HashMap<>();
for (String src : delta) {
Ref r = local.get(src);
if (r != null) {
@@ -442,7 +442,7 @@ class PushOne implements ProjectRunnable {
private List<RemoteRefUpdate> doPushAll(Transport tn, Map<String, Ref> local)
throws NotSupportedException, TransportException, IOException {
- List<RemoteRefUpdate> cmds = Lists.newArrayList();
+ List<RemoteRefUpdate> cmds = new ArrayList<>();
boolean noPerms = !pool.isReplicatePermissions();
Map<String, Ref> remote = listRemote(tn);
for (Ref src : local.values()) {
@@ -476,7 +476,7 @@ class PushOne implements ProjectRunnable {
private List<RemoteRefUpdate> doPushDelta(Map<String, Ref> local)
throws IOException {
- List<RemoteRefUpdate> cmds = Lists.newArrayList();
+ List<RemoteRefUpdate> cmds = new ArrayList<>();
boolean noPerms = !pool.isReplicatePermissions();
for (String src : delta) {
RefSpec spec = matchSrc(src);
diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationQueue.java b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationQueue.java
index 606bfe2..fc11773 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationQueue.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/ReplicationQueue.java
@@ -15,7 +15,6 @@
package com.googlesource.gerrit.plugins.replication;
import com.google.common.base.Strings;
-import com.google.common.collect.Sets;
import com.google.gerrit.common.EventDispatcher;
import com.google.gerrit.extensions.events.GitReferenceUpdatedListener;
import com.google.gerrit.extensions.events.HeadUpdatedListener;
@@ -52,6 +51,7 @@ import java.io.IOException;
import java.io.OutputStream;
import java.net.URISyntaxException;
import java.util.Collections;
+import java.util.HashSet;
import java.util.Set;
/** Manages automatic replication to remote repositories. */
@@ -188,7 +188,7 @@ public class ReplicationQueue implements
return Collections.emptySet();
}
- Set<URIish> uris = Sets.newHashSet();
+ Set<URIish> uris = new HashSet<>();
for (Destination config : this.config.getDestinations(filterType)) {
if (!config.wouldPushProject(projectName)) {
continue;