Bump odlparent to 5.0.0

[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 d142d335d74b28a4dc639ed56bb800be5a14b347..74199b2cd11c0a00c9e13b969f4120f24a36ce83 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
@@ -8,12 +8,17 @@
 
 package org.opendaylight.lispflowmapping.implementation.util;
 
+import com.google.common.base.Preconditions;
+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.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;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecordBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.EidUri;
@@ -25,9 +30,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev15090
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.MappingBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.mapping.XtrIdMapping;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.mapping.XtrIdMappingBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.mapping.authkey.container.MappingAuthkey;
 
 /**
+ * DataStoreBackEnd utilities.
+ *
  * @author Florin Coras
  *
  */
@@ -36,10 +42,26 @@ public final class DSBEInputUtil {
     private DSBEInputUtil() {
     }
 
-    public static Mapping toMapping(MappingOrigin origin, Eid key, SiteId siteId, MappingRecord record) {
+    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();
+    }
+
+    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();
+        return new MappingBuilder()
+                .setEidUri(new EidUri(LispAddressStringifier.getURIString(key)))
+                .setOrigin(origin)
+                .setSiteId(siteIds)
+                .setMappingRecord(record).build();
     }
 
     public static Mapping toMapping(MappingOrigin origin, Eid key) {
@@ -50,9 +72,13 @@ public final class DSBEInputUtil {
         return mb.build();
     }
 
-    public static XtrIdMapping toXtrIdMapping(MappingRecord record) {
-        return new XtrIdMappingBuilder().setXtrIdUri(
-                new XtrIdUri(LispAddressStringifier.getURIString(record.getXtrId()))).setMappingRecord(record).build();
+    public static XtrIdMapping toXtrIdMapping(MappingData mappingData) {
+        Preconditions.checkNotNull(mappingData);
+        MappingRecord record = mappingData.getRecord();
+        Preconditions.checkNotNull(mappingData.getRecord());
+        return new XtrIdMappingBuilder()
+                    .setXtrIdUri(new XtrIdUri(LispAddressStringifier.getURIString(record.getXtrId())))
+                    .setMappingRecord(record).build();
     }
 
     public static AuthenticationKey toAuthenticationKey(Eid key, MappingAuthkey authKey) {