Modernize MoreObjects.firstNonNull() use

Objects.requireNonNullElse() provides a built-in alternative, use
that.

Change-Id: I882927121450ef000232823daa1d25d8c7fc302a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/DefaultMdsalSslData.java b/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/DefaultMdsalSslData.java
index d3c7fcc1bf23f8433af9053d0b02024dec77f931..0f0a4d23902194c28511170a56a8e53ed197ceba 100644 (file)
--- a/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/DefaultMdsalSslData.java
+++ b/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/DefaultMdsalSslData.java
@@ -8,8 +8,8 @@
 package org.opendaylight.aaa.cert.impl;
 
 import static java.util.Objects.requireNonNull;
+import static java.util.Objects.requireNonNullElse;
 
-import com.google.common.base.MoreObjects;
 import java.security.KeyStore;
 import java.util.ArrayList;
 import java.util.List;
@@ -100,7 +100,7 @@ public class DefaultMdsalSslData implements IAaaCertProvider {
 
     @Override
     public String getCertificateTrustStore(String alias, boolean withTag) {
-        return MoreObjects.firstNonNull(aaaCertMdsalProv.getTrustStoreCertificate(bundleName, alias, withTag), "");
+        return requireNonNullElse(aaaCertMdsalProv.getTrustStoreCertificate(bundleName, alias, withTag), "");
     }
 
     @Override
@@ -114,7 +114,7 @@ public class DefaultMdsalSslData implements IAaaCertProvider {
 
     @Override
     public String getODLKeyStoreCertificate(final boolean withTag) {
-        return MoreObjects.firstNonNull(aaaCertMdsalProv.getODLStoreCertificate(bundleName, withTag), "");
+        return requireNonNullElse(aaaCertMdsalProv.getODLStoreCertificate(bundleName, withTag), "");
     }
 
     @Override