Replace usage of deprecated Objects.firstNonNull Change-Id: I1185d34c7e2c339afaa3d17f9cc5c115e0ba6eac Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
diff --git a/src/main/java/com/googlesource/gerrit/plugins/imagare/GetConfig.java b/src/main/java/com/googlesource/gerrit/plugins/imagare/GetConfig.java index f5a5f6a..52b225d 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/imagare/GetConfig.java +++ b/src/main/java/com/googlesource/gerrit/plugins/imagare/GetConfig.java
@@ -14,7 +14,7 @@ package com.googlesource.gerrit.plugins.imagare; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.gerrit.extensions.annotations.PluginName; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.server.config.ConfigResource; @@ -36,7 +36,7 @@ public ConfigInfo apply(ConfigResource resource) { ConfigInfo info = new ConfigInfo(); info.defaultProject = - Objects.firstNonNull(cfg.getString("defaultProject"), "All-Projects"); + MoreObjects.firstNonNull(cfg.getString("defaultProject"), "All-Projects"); info.linkDecoration = cfg.getEnum("linkDecoration", LinkDecoration.NONE); if (LinkDecoration.NONE.equals(info.linkDecoration)) { info.linkDecoration = null;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/imagare/GetPreference.java b/src/main/java/com/googlesource/gerrit/plugins/imagare/GetPreference.java index 82dfcd8..c470254 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/imagare/GetPreference.java +++ b/src/main/java/com/googlesource/gerrit/plugins/imagare/GetPreference.java
@@ -14,7 +14,7 @@ package com.googlesource.gerrit.plugins.imagare; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.gerrit.extensions.annotations.PluginName; import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.RestReadView; @@ -65,13 +65,13 @@ ConfigInfo info = new ConfigInfo(); info.defaultProject = - Objects.firstNonNull( + MoreObjects.firstNonNull( db.getString(PREFERENCE, username, KEY_DEFAULT_PROJECT), globalCfg.defaultProject); info.linkDecoration = db.getEnum(PREFERENCE, username, KEY_LINK_DECORATION, - Objects.firstNonNull(globalCfg.linkDecoration, LinkDecoration.NONE)); + MoreObjects.firstNonNull(globalCfg.linkDecoration, LinkDecoration.NONE)); if (LinkDecoration.NONE.equals(info.linkDecoration)) { info.linkDecoration = null; }