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 fc1e931292ac85acb920d3b0da1aa02438134e6e..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,16 @@
  * 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 static java.util.Objects.requireNonNull;
+
+import edu.umd.cs.findbugs.annotations.Nullable;
 import java.util.Arrays;
 import java.util.List;
 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;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.XtrId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.authkey.container.MappingAuthkey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecord;
@@ -32,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
@@ -40,10 +40,25 @@ 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;
-        return new MappingBuilder().setEidUri(new EidUri(LispAddressStringifier.getURIString(key)))
-                .setOrigin(origin).setSiteId(siteIds).setMappingRecord(record).build();
+        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)
+                    .setSiteId(siteIds)
+                    .setMappingRecord(record).build();
+    }
+
+    public static Mapping toMapping(MappingOrigin origin, Eid key, @Nullable MappingData mappingData) {
+        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;
+        return new MappingBuilder()
+                .setEidUri(new EidUri(LispAddressStringifier.getURIString(key)))
+                .setOrigin(origin)
+                .setSiteId(siteIds)
+                .setMappingRecord(record).build();
     }
 
     public static Mapping toMapping(MappingOrigin origin, Eid key) {
@@ -55,13 +70,12 @@ public final class DSBEInputUtil {
     }
 
     public static XtrIdMapping toXtrIdMapping(MappingData mappingData) {
-        MappingRecord record = (mappingData != null) ? mappingData.getRecord() : null;
-        return new XtrIdMappingBuilder().setXtrIdUri(
-                new XtrIdUri(LispAddressStringifier.getURIString(record.getXtrId()))).setMappingRecord(record).build();
-    }
-
-    public static XtrIdMapping toXtrIdMapping(XtrId xtrId) {
-        return new XtrIdMappingBuilder().setXtrIdUri(new XtrIdUri(LispAddressStringifier.getURIString(xtrId))).build();
+        requireNonNull(mappingData);
+        MappingRecord record = mappingData.getRecord();
+        requireNonNull(mappingData.getRecord());
+        return new XtrIdMappingBuilder()
+                    .setXtrIdUri(new XtrIdUri(LispAddressStringifier.getURIString(record.getXtrId())))
+                    .setMappingRecord(record).build();
     }
 
     public static AuthenticationKey toAuthenticationKey(Eid key, MappingAuthkey authKey) {