Bump upstreams for Silicon

[lispflowmapping.git] / mappingservice / implementation / src / main / java / org / opendaylight / lispflowmapping / implementation / util / DSBEInputUtil.java

diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/DSBEInputUtil.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/DSBEInputUtil.java
index d2c77f6a8d49a244fff7e13b185ba2d03538cafc..64b5778e98d74f38a9ac35cefd398c8c4fc2d7d2 100644 (file)
--- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/DSBEInputUtil.java
+++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/DSBEInputUtil.java
@@ -5,15 +5,13 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.lispflowmapping.implementation.util;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
 
+import edu.umd.cs.findbugs.annotations.Nullable;
 import java.util.Arrays;
 import java.util.List;
-import javax.annotation.Nullable;
-
 import org.opendaylight.lispflowmapping.lisp.type.MappingData;
 import org.opendaylight.lispflowmapping.lisp.util.LispAddressStringifier;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.SiteId;
@@ -35,7 +33,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev15090
  * DataStoreBackEnd utilities.
  *
  * @author Florin Coras
- *
  */
 public final class DSBEInputUtil {
     // Utility class, should not be instantiated
@@ -43,8 +40,8 @@ public final class DSBEInputUtil {
     }
 
     public static Mapping toMapping(MappingOrigin origin, Eid key, SiteId siteId, MappingData mappingData) {
-        MappingRecord record = (mappingData != null) ? mappingData.getRecord() : null;
-        List<SiteId> siteIds = (siteId != null) ? Arrays.asList(siteId) : null;
+        MappingRecord record = mappingData != null ? mappingData.getRecord() : null;
+        List<SiteId> siteIds = siteId != null ? Arrays.asList(siteId) : null;
         return new MappingBuilder()
                     .setEidUri(new EidUri(LispAddressStringifier.getURIString(key)))
                     .setOrigin(origin)
@@ -53,10 +50,10 @@ public final class DSBEInputUtil {
     }
 
     public static Mapping toMapping(MappingOrigin origin, Eid key, @Nullable MappingData mappingData) {
-        MappingRecord record = (mappingData != null) ? mappingData.getRecord() :
+        MappingRecord record = mappingData != null ? mappingData.getRecord() :
                                                         new MappingRecordBuilder().setEid(key).build();
-        SiteId siteId = (record != null) ? record.getSiteId() : null;
-        List<SiteId> siteIds = (siteId != null) ? Arrays.asList(siteId) : null;
+        SiteId siteId = record != null ? record.getSiteId() : null;
+        List<SiteId> siteIds = siteId != null ? Arrays.asList(siteId) : null;
         return new MappingBuilder()
                 .setEidUri(new EidUri(LispAddressStringifier.getURIString(key)))
                 .setOrigin(origin)
@@ -73,9 +70,9 @@ public final class DSBEInputUtil {
     }
 
     public static XtrIdMapping toXtrIdMapping(MappingData mappingData) {
-        Preconditions.checkNotNull(mappingData);
+        requireNonNull(mappingData);
         MappingRecord record = mappingData.getRecord();
-        Preconditions.checkNotNull(mappingData.getRecord());
+        requireNonNull(mappingData.getRecord());
         return new XtrIdMappingBuilder()
                     .setXtrIdUri(new XtrIdUri(LispAddressStringifier.getURIString(record.getXtrId())))
                     .setMappingRecord(record).build();