commit 4b904fe4dcafc7c204179a606ef169d818efc971
author Paladox none <thomasmulhall410@yahoo.com> Tue Feb 21 08:54:03 2017 +0000
committer David Pursehouse <dpursehouse@collab.net> Thu Mar 02 23:54:18 2017 +0000
tree f5c1f0f51ff4589bc536383af5994cd4f79cbfeb
parent 5297d8537b43950cfa099eccfbad47b9a7018341

Replace Objects.firstNonNull() with MoreObjects.firstNonNull().

Objects.firstNonNull was deprecated in Guava 18 [1] and removed
in Guava 21 [2].

[1] https://github.com/google/guava/wiki/Release18
[2] https://github.com/google/guava/wiki/Release21

Change-Id: I8287d1766b6e30721cf732de661b6c659369ea4f

src/main/java/com/googlesource/gerrit/plugins/its/rtc/network/RTCHttpParams.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/rtc/network/RTCHttpParams.java b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/network/RTCHttpParams.java
index 4758ede..1be4750 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/rtc/network/RTCHttpParams.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/network/RTCHttpParams.java
@@ -22,7 +22,7 @@
 import org.apache.http.params.HttpParams;
 import org.eclipse.jgit.lib.Config;
 
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
 import com.google.gerrit.extensions.annotations.PluginName;
 import com.google.gerrit.server.config.GerritServerConfig;
 import com.google.inject.Inject;
@@ -133,7 +133,7 @@
   }
 
   private ParameterParser getParameterParser(String name) {
-    return Objects.firstNonNull(TYPES.get(name), TYPE_STRING);
+    return MoreObjects.firstNonNull(TYPES.get(name), TYPE_STRING);
   }
 
   @Override