Reorganize mappingservice.implementation

[lispflowmapping.git] / mappingservice / implementation / src / main / java / org / opendaylight / lispflowmapping / implementation / dao / MappingKeyUtil.java

diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/dao/MappingServiceKeyUtil.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/dao/MappingKeyUtil.java
similarity index 56%
rename from mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/dao/MappingServiceKeyUtil.java
rename to mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/dao/MappingKeyUtil.java
index 5dc7a139ba40fc6d8d6d53aea828035267dc86d9..ea635232ce8081fecdd3fb3fc87213fe9068d061 100644 (file)
--- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/dao/MappingServiceKeyUtil.java
+++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/dao/MappingKeyUtil.java
@@ -7,38 +7,38 @@
  */
 package org.opendaylight.lispflowmapping.implementation.dao;
 
-import org.opendaylight.lispflowmapping.implementation.util.LispAFIConvertor;
 import org.opendaylight.lispflowmapping.implementation.util.MaskUtil;
-import org.opendaylight.lispflowmapping.interfaces.dao.IMappingServiceKey;
+import org.opendaylight.lispflowmapping.interfaces.dao.IMappingKey;
+import org.opendaylight.lispflowmapping.lisp.util.LispAFIConvertor;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.LispAFIAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.lispaddress.LispAddressContainer;
 
-public class MappingServiceKeyUtil {
+public class MappingKeyUtil {
 
-    public static IMappingServiceKey generateMappingServiceKey(LispAddressContainer lispAddressContainer, int mask) {
+    public static IMappingKey generateMappingKey(LispAddressContainer lispAddressContainer, int mask) {
         LispAFIAddress address = LispAFIConvertor.toAFI(lispAddressContainer);
         if (MaskUtil.isMaskable(address)) {
             LispAddressContainer normalizedAddress = LispAFIConvertor.toContainer(MaskUtil.normalize(address, mask));
-            return new MappingServiceKey(normalizedAddress, mask);
+            return new MappingKey(normalizedAddress, mask);
         } else {
-            return new MappingServiceNoMaskKey(lispAddressContainer);
+            return new MappingNoMaskKey(lispAddressContainer);
         }
     }
 
-    public static IMappingServiceKey generateMappingServiceKey(LispAFIAddress address, int mask) {
+    public static IMappingKey generateMappingKey(LispAFIAddress address, int mask) {
         if (MaskUtil.isMaskable(address)) {
             LispAddressContainer normalizedAddress = LispAFIConvertor.toContainer(MaskUtil.normalize(address, mask));
-            return new MappingServiceKey(normalizedAddress, mask);
+            return new MappingKey(normalizedAddress, mask);
         } else {
-            return new MappingServiceNoMaskKey(LispAFIConvertor.toContainer(address));
+            return new MappingNoMaskKey(LispAFIConvertor.toContainer(address));
         }
     }
 
-    public static IMappingServiceKey generateMappingServiceKey(LispAddressContainer lispAddressContainer) {
+    public static IMappingKey generateMappingKey(LispAddressContainer lispAddressContainer) {
         LispAFIAddress address = LispAFIConvertor.toAFI(lispAddressContainer);
         if (MaskUtil.isMaskable(address)) {
-            return generateMappingServiceKey(lispAddressContainer, MaskUtil.getMaxMask(address));
+            return generateMappingKey(lispAddressContainer, MaskUtil.getMaxMask(address));
         } else
-            return generateMappingServiceKey(lispAddressContainer, 0);
+            return generateMappingKey(lispAddressContainer, 0);
     }
 }