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 150ac80cefac9d267d22b86b401af1b5e8190f74..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
@@ -9,9 +9,9 @@ package org.opendaylight.lispflowmapping.implementation.util;
 
 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.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.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;
@@ -26,7 +26,7 @@ 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;
 
 /**
- * Converts RPC *Input object to other object types
+ * Converts RPC *Input object to other object types.
  *
  * @author Lorand Jakab
  *
@@ -48,6 +48,16 @@ public final class RPCInputConvertorUtil {
         return toAuthenticationKey(input.getEid(), null);
     }
 
+    private static AuthenticationKey toAuthenticationKey(Eid address, MappingAuthkey key) {
+        AuthenticationKeyBuilder akb = new AuthenticationKeyBuilder();
+        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) {
         return toMapping(input.getMappingRecord());
     }
@@ -60,16 +70,6 @@ public final class RPCInputConvertorUtil {
         return toMapping(input.getEid());
     }
 
-    private static AuthenticationKey toAuthenticationKey(Eid address, MappingAuthkey key) {
-        AuthenticationKeyBuilder akb = new AuthenticationKeyBuilder();
-        akb.setEidUri(new EidUri(LispAddressStringifier.getURIString(address)));
-        akb.setEid(address);
-        if (key != null) {
-            akb.setMappingAuthkey(key);
-        }
-        return akb.build();
-    }
-
     private static Mapping toMapping(MappingRecord mapping) {
         MappingBuilder mb = new MappingBuilder();
         mb.setEidUri(new EidUri(LispAddressStringifier.getURIString(mapping.getEid())));