Code Review / lispflowmapping.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Bump MRI upstreams
[lispflowmapping.git] / mappingservice / implementation / src / main / java / org / opendaylight / lispflowmapping / implementation / util / RPCInputConvertorUtil.java
diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/RPCInputConvertorUtil.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/RPCInputConvertorUtil.java
index 66c6f60faccbf4f109a04ab35233a6960e48ffcd..8e93ddd37d71e3873eb73812869c113594213ca3 100644 (file)
--- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/RPCInputConvertorUtil.java
+++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/RPCInputConvertorUtil.java
@@ -7,88 +7,82 @@
  */
 package org.opendaylight.lispflowmapping.implementation.util;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.AddKeyInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.AddMappingInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.EidUri;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.MappingOrigin;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.RemoveKeyInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.RemoveMappingInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.UpdateKeyInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.UpdateMappingInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.db.instance.AuthenticationKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.db.instance.AuthenticationKeyBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.db.instance.Mapping;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.db.instance.MappingBuilder;
+import org.opendaylight.lispflowmapping.lisp.util.LispAddressStringifier;
+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._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.lisp.proto.rev151105.mapping.authkey.container.MappingAuthkey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.AddKeyInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.AddMappingInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.EidUri;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.MappingOrigin;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.RemoveKeyInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.RemoveMappingInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.UpdateKeyInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.UpdateMappingInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.AuthenticationKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.AuthenticationKeyBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.Mapping;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.MappingBuilder;
 
 /**
- * Converts RPC *Input object to other object types
+ * Converts RPC *Input object to other object types.
  *
  * @author Lorand Jakab
  *
  */
-public class RPCInputConvertorUtil {
+public final class RPCInputConvertorUtil {
+    // Utility class, should not be instantiated
+    private RPCInputConvertorUtil() {
+    }
+
     public static AuthenticationKey toAuthenticationKey(AddKeyInput input) {
-        AuthenticationKeyBuilder akb = new AuthenticationKeyBuilder();
-        akb.setEid(new EidUri(LispAFIConvertor.toString(input.getLispAddressContainer())));
-        akb.setLispAddressContainer(input.getLispAddressContainer());
-        akb.setMaskLength(input.getMaskLength());
-        akb.setKeyType(input.getKeyType());
-        akb.setAuthkey(input.getAuthkey());
-        return akb.build();
+        return toAuthenticationKey(input.getEid(), input.getMappingAuthkey());
     }
 
     public static AuthenticationKey toAuthenticationKey(UpdateKeyInput input) {
-        AuthenticationKeyBuilder akb = new AuthenticationKeyBuilder();
-        akb.setEid(new EidUri(LispAFIConvertor.toString(input.getEid().getLispAddressContainer())));
-        akb.setLispAddressContainer(input.getEid().getLispAddressContainer());
-        akb.setMaskLength(input.getEid().getMaskLength());
-        akb.setKeyType(input.getKey().getKeyType());
-        akb.setAuthkey(input.getKey().getAuthkey());
-        return akb.build();
+        return toAuthenticationKey(input.getEid(), input.getMappingAuthkey());
     }
 
     public static AuthenticationKey toAuthenticationKey(RemoveKeyInput input) {
+        return toAuthenticationKey(input.getEid(), null);
+    }
+
+    private static AuthenticationKey toAuthenticationKey(Eid address, MappingAuthkey key) {
         AuthenticationKeyBuilder akb = new AuthenticationKeyBuilder();
-        akb.setEid(new EidUri(LispAFIConvertor.toString(input.getLispAddressContainer())));
-        akb.setLispAddressContainer(input.getLispAddressContainer());
-        akb.setMaskLength(input.getMaskLength());
+        akb.setEidUri(new EidUri(LispAddressStringifier.getURIString(address)));
+        akb.setEid(address);
+        if (key != null) {
+            akb.setMappingAuthkey(key);
+        }
         return akb.build();
     }
 
     public static Mapping toMapping(AddMappingInput input) {
-        MappingBuilder mb = new MappingBuilder();
-        mb.setEid(new EidUri(LispAFIConvertor.toString(input.getLispAddressContainer())));
-        mb.setOrigin(MappingOrigin.Northbound);
-        mb.setRecordTtl(input.getRecordTtl());
-        mb.setMaskLength(input.getMaskLength());
-        mb.setMapVersion(input.getMapVersion());
-        mb.setAction(input.getAction());
-        mb.setAuthoritative(input.isAuthoritative());
-        mb.setLispAddressContainer(input.getLispAddressContainer());
-        mb.setLocatorRecord(input.getLocatorRecord());
-        return mb.build();
+        return toMapping(input.getMappingRecord());
     }
 
     public static Mapping toMapping(UpdateMappingInput input) {
+        return toMapping(input.getMappingRecord());
+    }
+
+    public static Mapping toMapping(RemoveMappingInput input) {
+        return toMapping(input.getEid());
+    }
+
+    private static Mapping toMapping(MappingRecord mapping) {
         MappingBuilder mb = new MappingBuilder();
-        mb.setEid(new EidUri(LispAFIConvertor.toString(input.getLispAddressContainer())));
+        mb.setEidUri(new EidUri(LispAddressStringifier.getURIString(mapping.getEid())));
         mb.setOrigin(MappingOrigin.Northbound);
-        mb.setRecordTtl(input.getRecordTtl());
-        mb.setMaskLength(input.getMaskLength());
-        mb.setMapVersion(input.getMapVersion());
-        mb.setAction(input.getAction());
-        mb.setAuthoritative(input.isAuthoritative());
-        mb.setLispAddressContainer(input.getLispAddressContainer());
-        mb.setLocatorRecord(input.getLocatorRecord());
+        mb.setMappingRecord(mapping);
         return mb.build();
     }
 
-    public static Mapping toMapping(RemoveMappingInput input) {
+    private static Mapping toMapping(Eid eid) {
         MappingBuilder mb = new MappingBuilder();
-        mb.setEid(new EidUri(LispAFIConvertor.toString(input.getLispAddressContainer())));
+        mb.setEidUri(new EidUri(LispAddressStringifier.getURIString(eid)));
         mb.setOrigin(MappingOrigin.Northbound);
-        mb.setMaskLength(input.getMaskLength());
-        mb.setLispAddressContainer(input.getLispAddressContainer());
+        mb.setMappingRecord(new MappingRecordBuilder().setEid(eid).build());
         return mb.build();
     }
 }
OpenDaylight LISP Mapping Service