Replace deprecated Objects.firstNonNull with MoreObjects.firstNonNull
Change-Id: Ia030d6900f5de673b238f424dfb3baae301fb830
diff --git a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubLogin.java b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubLogin.java
index 79cd552..a487ec0 100644
--- a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubLogin.java
+++ b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubLogin.java
@@ -39,7 +39,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import com.googlesource.gerrit.plugins.github.oauth.OAuthProtocol.AccessToken;
@@ -184,7 +184,7 @@
response.addCookie(scopeCookie);
}
- return Objects.firstNonNull(scopeRequested, "scopes");
+ return MoreObjects.firstNonNull(scopeRequested, "scopes");
}
private String getScopesKeyFromCookie(HttpServletRequest request) {
@@ -209,7 +209,7 @@
}
private List<Scope> scopesForKey(String baseScopeKey) {
- return Objects
+ return MoreObjects
.firstNonNull(config.scopes.get(baseScopeKey), DEFAULT_SCOPES);
}
}
diff --git a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubLogoutServletResponse.java b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubLogoutServletResponse.java
index a2ee754..0c42deb 100644
--- a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubLogoutServletResponse.java
+++ b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubLogoutServletResponse.java
@@ -18,7 +18,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
public class GitHubLogoutServletResponse extends HttpServletResponseWrapper {
private String redirectUrl;
@@ -30,6 +30,6 @@
@Override
public void sendRedirect(String location) throws IOException {
- super.sendRedirect(Objects.firstNonNull(redirectUrl, location));
+ super.sendRedirect(MoreObjects.firstNonNull(redirectUrl, location));
}
}
diff --git a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubOAuthConfig.java b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubOAuthConfig.java
index 14cce5c..4514824 100644
--- a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubOAuthConfig.java
+++ b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubOAuthConfig.java
@@ -22,7 +22,7 @@
import org.eclipse.jgit.lib.Config;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Strings;
import com.google.common.collect.Maps;
import com.google.gerrit.reviewdb.client.AuthType;
@@ -65,7 +65,7 @@
httpHeader = config.getString("auth", null, "httpHeader");
oauthHttpHeader = config.getString("auth", null, "httpExternalIdHeader");
gitHubUrl = dropTrailingSlash(
- Objects.firstNonNull(config.getString(CONF_SECTION, null, "url"),
+ MoreObjects.firstNonNull(config.getString(CONF_SECTION, null, "url"),
GITHUB_URL));
gitHubClientId = config.getString(CONF_SECTION, null, "clientId");
gitHubClientSecret = config.getString(CONF_SECTION, null, "clientSecret");
diff --git a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/OAuthGitFilter.java b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/OAuthGitFilter.java
index 91f3b86..48275e2 100644
--- a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/OAuthGitFilter.java
+++ b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/OAuthGitFilter.java
@@ -46,7 +46,7 @@
import org.apache.http.entity.StringEntity;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Strings;
import com.google.common.collect.Iterators;
import com.google.gerrit.httpd.XGerritAuth;
@@ -280,7 +280,7 @@
}
static String encoding(HttpServletRequest req) {
- return Objects.firstNonNull(req.getCharacterEncoding(), "UTF-8");
+ return MoreObjects.firstNonNull(req.getCharacterEncoding(), "UTF-8");
}
private String getHttpBasicAuthenticationHeader(final HttpServletRequest req)
diff --git a/github-plugin/src/main/java/com/google/gerrit/server/account/AccountImporter.java b/github-plugin/src/main/java/com/google/gerrit/server/account/AccountImporter.java
index 88ced25..648a0e3 100644
--- a/github-plugin/src/main/java/com/google/gerrit/server/account/AccountImporter.java
+++ b/github-plugin/src/main/java/com/google/gerrit/server/account/AccountImporter.java
@@ -18,7 +18,7 @@
import org.apache.http.HttpStatus;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.gerrit.extensions.common.AccountInfo;
import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.extensions.restapi.ResourceConflictException;
@@ -53,7 +53,7 @@
CreateAccount.Input accountInput = new CreateAccount.Input();
accountInput.email = email;
accountInput.username = login;
- accountInput.name = Objects.firstNonNull(name, login);
+ accountInput.name = MoreObjects.firstNonNull(name, login);
Response<AccountInfo> accountResponse =
(Response<AccountInfo>) createAccount.apply(TopLevelResource.INSTANCE,
accountInput);
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/GitHubConfig.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/GitHubConfig.java
index ff00469..148f9b5 100644
--- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/GitHubConfig.java
+++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/GitHubConfig.java
@@ -19,7 +19,7 @@
import org.eclipse.jgit.lib.Config;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.collect.Maps;
import com.google.gerrit.server.config.AllProjectsNameProvider;
import com.google.gerrit.server.config.GerritServerConfig;
@@ -123,7 +123,7 @@
}
public String getBaseProject(boolean isPrivateProject) {
- return Objects.firstNonNull(isPrivateProject ? privateBaseProject
+ return MoreObjects.firstNonNull(isPrivateProject ? privateBaseProject
: publicBaseProject, allProjectsName);
}
}
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/replication/Destination.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/replication/Destination.java
index 6519c16..f483a34 100644
--- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/replication/Destination.java
+++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/replication/Destination.java
@@ -22,7 +22,7 @@
import org.eclipse.jgit.transport.RemoteConfig;
import org.eclipse.jgit.transport.URIish;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
import com.google.gerrit.common.data.GroupReference;
@@ -55,7 +55,7 @@
remote = rc;
remoteNameStyle =
- Objects.firstNonNull(
+ MoreObjects.firstNonNull(
cfg.getString("remote", rc.getName(), "remoteNameStyle"), "slash");
String[] authGroupNames =
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/velocity/VelocityViewServlet.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/velocity/VelocityViewServlet.java
index 0d1cc41..b8374ad 100644
--- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/velocity/VelocityViewServlet.java
+++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/velocity/VelocityViewServlet.java
@@ -32,7 +32,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.gerrit.server.IdentifiedUser;
import com.google.inject.Inject;
import com.google.inject.Provider;
@@ -81,7 +81,7 @@
+ nextPage.uri;
}
- String pathInfo = Objects.firstNonNull(destUrl, servletPath);
+ String pathInfo = MoreObjects.firstNonNull(destUrl, servletPath);
if (!pathInfo.startsWith(STATIC_PREFIX)) {
resp.sendError(HttpStatus.SC_NOT_FOUND);
}
