From: Lorand Jakab <lojakab@cisco.com>
Date: Wed, 10 Aug 2016 20:07:53 +0000 (-0500)
Subject: Checkstyle: fix issues and enforce on implementation
X-Git-Tag: release/carbon~104
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=105e3c2a4c62a7ab0bb1e94cdd86923ab499f5b1;p=lispflowmapping.git

Checkstyle: fix issues and enforce on implementation

Change-Id: I762736d04a7a6f6855681469619bd261b6b757f2
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
---

diff --git a/mappingservice/dsbackend/pom.xml b/mappingservice/dsbackend/pom.xml
index 62eba9dc5..ca9419e88 100644
--- a/mappingservice/dsbackend/pom.xml
+++ b/mappingservice/dsbackend/pom.xml
@@ -50,22 +50,6 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <!-- Enforce odlparent checkstyle -->
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-checkstyle-plugin</artifactId>
-          <configuration>
-            <includeTestSourceDirectory>true</includeTestSourceDirectory>
-            <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
   <!--
       Maven Site Configuration
 
diff --git a/mappingservice/implementation/pom.xml b/mappingservice/implementation/pom.xml
index 1cae893be..f4603cc60 100644
--- a/mappingservice/implementation/pom.xml
+++ b/mappingservice/implementation/pom.xml
@@ -59,40 +59,6 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <!-- Temporarily override the odlparent checkstyle configuration.
-               We want to enforce some simple rules and add more as we clean up code -->
-          <artifactId>maven-checkstyle-plugin</artifactId>
-          <configuration>
-            <configLocation>checkstyle/java_rules.xml</configLocation>
-            <includeTestSourceDirectory>true</includeTestSourceDirectory>
-            <excludes>org/opendaylight/yang/gen/**,**/config/yang/**</excludes>
-            <failsOnError>true</failsOnError>
-            <consoleOutput>true</consoleOutput>
-          </configuration>
-          <dependencies>
-            <dependency>
-              <groupId>org.opendaylight.lispflowmapping</groupId>
-              <artifactId>common.build.tools</artifactId>
-              <version>${project.version}</version>
-            </dependency>
-          </dependencies>
-          <executions>
-            <execution>
-              <goals>
-                <goal>check</goal>
-              </goals>
-              <phase>process-sources</phase>
-            </execution>
-          </executions>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
   <!--
       Maven Site Configuration
 
diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/LispMappingService.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/LispMappingService.java
index e2014a0f0..47f5e7821 100644
--- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/LispMappingService.java
+++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/LispMappingService.java
@@ -16,14 +16,15 @@ import org.opendaylight.lispflowmapping.implementation.config.ConfigIni;
 import org.opendaylight.lispflowmapping.implementation.lisp.MapResolver;
 import org.opendaylight.lispflowmapping.implementation.lisp.MapServer;
 import org.opendaylight.lispflowmapping.implementation.util.LispNotificationHelper;
-import org.opendaylight.lispflowmapping.lisp.type.LispMessage;
 import org.opendaylight.lispflowmapping.interfaces.lisp.IFlowMapping;
 import org.opendaylight.lispflowmapping.interfaces.lisp.IMapNotifyHandler;
 import org.opendaylight.lispflowmapping.interfaces.lisp.IMapRequestResultHandler;
 import org.opendaylight.lispflowmapping.interfaces.lisp.IMapResolverAsync;
 import org.opendaylight.lispflowmapping.interfaces.lisp.IMapServerAsync;
 import org.opendaylight.lispflowmapping.interfaces.mappingservice.IMappingService;
+import org.opendaylight.lispflowmapping.lisp.type.LispMessage;
 import org.opendaylight.lispflowmapping.lisp.util.LispAddressStringifier;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.AddMapping;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.GotMapNotify;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.GotMapReply;
@@ -49,7 +50,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.sb.rev150904.OdlLi
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.sb.rev150904.SendMapNotifyInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.sb.rev150904.SendMapReplyInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.sb.rev150904.SendMapRequestInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.MappingOrigin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -164,7 +164,7 @@ public class LispMappingService implements IFlowMapping, IMapRequestResultHandle
         Pair<MapNotify, List<TransportAddress>> result = handleMapRegister(mapRegisterNotification.getMapRegister());
         if (result != null && result.getLeft() != null) {
             MapNotify mapNotify = result.getLeft();
-            List <TransportAddress> rlocs = result.getRight();
+            List<TransportAddress> rlocs = result.getRight();
             if (rlocs == null) {
                 TransportAddressBuilder tab = new TransportAddressBuilder();
                 tab.setIpAddress(mapRegisterNotification.getTransportAddress().getIpAddress());
diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/MappingService.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/MappingService.java
index b8d405c12..930a655cc 100644
--- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/MappingService.java
+++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/MappingService.java
@@ -7,15 +7,16 @@
  */
 package org.opendaylight.lispflowmapping.implementation;
 
+import com.google.common.base.Preconditions;
+import com.google.common.util.concurrent.Futures;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Future;
-
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
+import org.opendaylight.lispflowmapping.dsbackend.DataStoreBackEnd;
 import org.opendaylight.lispflowmapping.implementation.config.ConfigIni;
 import org.opendaylight.lispflowmapping.implementation.mdsal.AuthenticationKeyDataListener;
-import org.opendaylight.lispflowmapping.dsbackend.DataStoreBackEnd;
 import org.opendaylight.lispflowmapping.implementation.mdsal.MappingDataListener;
 import org.opendaylight.lispflowmapping.implementation.util.DSBEInputUtil;
 import org.opendaylight.lispflowmapping.implementation.util.RPCInputConvertorUtil;
@@ -61,9 +62,6 @@ import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Preconditions;
-import com.google.common.util.concurrent.Futures;
-
 /**
  * Dispatcher of API calls that implements the RPC and Java APIs in mappingservice.yang and IMappingService
  * respectively. It also coordinates and acts as container for all objects in charge of
@@ -167,6 +165,27 @@ public class MappingService implements OdlMappingserviceService, IMappingService
         return Futures.immediateFuture(rpcResultBuilder.build());
     }
 
+    @Override
+    public void addMapping(MappingOrigin origin, Eid key, SiteId siteId, Object data, boolean merge) {
+        // SB registrations are first written to the MappingSystem and only afterwards are persisted to the datastore
+        if (origin.equals(MappingOrigin.Southbound)) {
+            // Store data first in MapCache and only afterwards persist to datastore. This should be used only for SB
+            // registrations
+            mappingSystem.addMapping(origin, key, data, merge);
+            dsbe.addMapping(DSBEInputUtil.toMapping(origin, key, siteId, (MappingRecord) data));
+            if (((MappingRecord) data).getXtrId() != null) {
+                dsbe.addXtrIdMapping(DSBEInputUtil.toXtrIdMapping((MappingRecord) data));
+            }
+        } else {
+            dsbe.addMapping(DSBEInputUtil.toMapping(origin, key, siteId, (MappingRecord) data));
+        }
+    }
+
+    @Override
+    public void updateMappingRegistration(MappingOrigin origin, Eid key, Long timestamp) {
+        mappingSystem.updateMappingRegistration(origin, key, timestamp);
+    }
+
     @Override
     public Future<RpcResult<GetKeyOutput>> getKey(GetKeyInput input) {
         Preconditions.checkNotNull(input, "get-key RPC input must be not null!");
@@ -208,6 +227,21 @@ public class MappingService implements OdlMappingserviceService, IMappingService
         return Futures.immediateFuture(rpcResultBuilder.build());
     }
 
+    @Override
+    public Object getMapping(MappingOrigin origin, Eid key) {
+        return mappingSystem.getMapping(origin, key);
+    }
+
+    @Override
+    public Object getMapping(Eid key) {
+        return mappingSystem.getMapping(key);
+    }
+
+    @Override
+    public Object getMapping(Eid srcKey, Eid dstKey) {
+        return mappingSystem.getMapping(srcKey, dstKey);
+    }
+
     @Override
     public Future<RpcResult<Void>> removeKey(RemoveKeyInput input) {
         Preconditions.checkNotNull(input, "remove-key RPC input must be not null!");
@@ -236,6 +270,11 @@ public class MappingService implements OdlMappingserviceService, IMappingService
         return Futures.immediateFuture(rpcResultBuilder.build());
     }
 
+    @Override
+    public void removeMapping(MappingOrigin origin, Eid key) {
+        dsbe.removeMapping(DSBEInputUtil.toMapping(origin, key));
+    }
+
     @Override
     public Future<RpcResult<Void>> updateKey(UpdateKeyInput input) {
         Preconditions.checkNotNull(input, "update-key RPC input must be not null!");
@@ -345,52 +384,11 @@ public class MappingService implements OdlMappingserviceService, IMappingService
         return null;
     }
 
-    @Override
-    public void addMapping(MappingOrigin origin, Eid key, SiteId siteId, Object data, boolean merge) {
-        // SB registrations are first written to the MappingSystem and only afterwards are persisted to the datastore
-        if (origin.equals(MappingOrigin.Southbound)) {
-            // Store data first in MapCache and only afterwards persist to datastore. This should be used only for SB
-            // registrations
-            mappingSystem.addMapping(origin, key, data, merge);
-            dsbe.addMapping(DSBEInputUtil.toMapping(origin, key, siteId, (MappingRecord) data));
-            if (((MappingRecord) data).getXtrId() != null) {
-                dsbe.addXtrIdMapping(DSBEInputUtil.toXtrIdMapping((MappingRecord) data));
-            }
-        } else {
-            dsbe.addMapping(DSBEInputUtil.toMapping(origin, key, siteId, (MappingRecord) data));
-        }
-    }
-
-    @Override
-    public void updateMappingRegistration(MappingOrigin origin, Eid key, Long timestamp) {
-        mappingSystem.updateMappingRegistration(origin, key, timestamp);
-    }
-
-    @Override
-    public Object getMapping(MappingOrigin origin, Eid key) {
-        return mappingSystem.getMapping(origin, key);
-    }
-
-    @Override
-    public Object getMapping(Eid key) {
-        return mappingSystem.getMapping(key);
-    }
-
-    @Override
-    public Object getMapping(Eid srcKey, Eid dstKey) {
-        return mappingSystem.getMapping(srcKey, dstKey);
-    }
-
     @Override
     public Eid getWidestNegativePrefix(Eid key) {
         return mappingSystem.getWidestNegativePrefix(key);
     }
 
-    @Override
-    public void removeMapping(MappingOrigin origin, Eid key) {
-        dsbe.removeMapping(DSBEInputUtil.toMapping(origin, key));
-    }
-
     @Override
     public void addAuthenticationKey(Eid key, MappingAuthkey authKey) {
         dsbe.addAuthenticationKey(DSBEInputUtil.toAuthenticationKey(key, authKey));
@@ -455,8 +453,8 @@ public class MappingService implements OdlMappingserviceService, IMappingService
             convertedLocators = convertFromBinaryIfNecessary(originalLocators);
         }
 
-        if (LispAddressUtil.addressNeedsConversionFromBinary(originalRecord.getEid().getAddress()) ||
-                (originalLocators != null && convertedLocators != null)) {
+        if (LispAddressUtil.addressNeedsConversionFromBinary(originalRecord.getEid().getAddress())
+                || (originalLocators != null && convertedLocators != null)) {
             MappingRecordBuilder mrb = new MappingRecordBuilder(originalRecord);
             mrb.setEid(LispAddressUtil.convertFromBinary(originalRecord.getEid()));
             if (convertedLocators != null) {
diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/MappingServiceShell.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/MappingServiceShell.java
index ec86a7f0d..51d38291c 100644
--- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/MappingServiceShell.java
+++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/MappingServiceShell.java
@@ -18,6 +18,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
+ * Implement Karaf commands to interact with the Mapping Service.
+ *
  * @author Lorand Jakab
  *
  */
diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/MappingSystem.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/MappingSystem.java
index b38453db6..33d43e9cc 100644
--- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/MappingSystem.java
+++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/MappingSystem.java
@@ -11,12 +11,8 @@ package org.opendaylight.lispflowmapping.implementation;
 import java.util.ArrayList;
 import java.util.EnumMap;
 import java.util.List;
-
-import org.opendaylight.lispflowmapping.implementation.config.ConfigIni;
 import org.opendaylight.lispflowmapping.dsbackend.DataStoreBackEnd;
-import org.opendaylight.lispflowmapping.mapcache.FlatMapCache;
-import org.opendaylight.lispflowmapping.mapcache.MultiTableMapCache;
-import org.opendaylight.lispflowmapping.mapcache.SimpleMapCache;
+import org.opendaylight.lispflowmapping.implementation.config.ConfigIni;
 import org.opendaylight.lispflowmapping.implementation.util.DSBEInputUtil;
 import org.opendaylight.lispflowmapping.implementation.util.MappingMergeUtil;
 import org.opendaylight.lispflowmapping.interfaces.dao.ILispDAO;
@@ -25,6 +21,9 @@ import org.opendaylight.lispflowmapping.interfaces.mapcache.IMappingSystem;
 import org.opendaylight.lispflowmapping.interfaces.mappingservice.IMappingService;
 import org.opendaylight.lispflowmapping.lisp.util.LispAddressStringifier;
 import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
+import org.opendaylight.lispflowmapping.mapcache.FlatMapCache;
+import org.opendaylight.lispflowmapping.mapcache.MultiTableMapCache;
+import org.opendaylight.lispflowmapping.mapcache.SimpleMapCache;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.SimpleAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.ExplicitLocatorPath;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv4;
@@ -47,13 +46,13 @@ import org.slf4j.LoggerFactory;
 
 /**
  * The Mapping System coordinates caching of md-sal stored mappings and if so configured enables longest prefix match
- * mapping lookups
+ * mapping lookups.
  *
  * @author Florin Coras
  *
  */
 public class MappingSystem implements IMappingSystem {
-    private final static Logger LOG = LoggerFactory.getLogger(MappingSystem.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MappingSystem.class);
     private boolean iterateMask;
     private boolean notificationService;
     private boolean overwrite;
@@ -167,6 +166,19 @@ public class MappingSystem implements IMappingSystem {
         }
     }
 
+    @Override
+    public Object getMapping(Eid dst) {
+        return getMapping((Eid)null, dst);
+    }
+
+    @Override
+    public Object getMapping(MappingOrigin origin, Eid key) {
+        if (origin.equals(MappingOrigin.Southbound)) {
+            return getSbMappingWithExpiration(null, key);
+        }
+        return tableMap.get(origin).getMapping(null, key);
+    }
+
     private Object getMappingNbFirst(Eid src, Eid dst) {
 
         // Default lookup policy is northboundFirst
@@ -216,28 +228,14 @@ public class MappingSystem implements IMappingSystem {
         return mappingObject;
     }
 
-    @Override
-    public Object getMapping(Eid dst) {
-        return getMapping((Eid)null, dst);
-    }
-
-    @Override
-    public Object getMapping(MappingOrigin origin, Eid key) {
-        if (origin.equals(MappingOrigin.Southbound)) {
-            return getSbMappingWithExpiration(null, key);
-        }
-        return tableMap.get(origin).getMapping(null, key);
-    }
-
     @Override
     public Eid getWidestNegativePrefix(Eid key) {
-        Eid nbPrefix, sbPrefix;
-        nbPrefix = pmc.getWidestNegativeMapping(key);
+        Eid nbPrefix = pmc.getWidestNegativeMapping(key);
         if (nbPrefix == null) {
             return null;
         }
 
-        sbPrefix = smc.getWidestNegativeMapping(key);
+        Eid sbPrefix = smc.getWidestNegativeMapping(key);
         if (sbPrefix == null) {
             return null;
         }
@@ -245,7 +243,7 @@ public class MappingSystem implements IMappingSystem {
         // since prefixes overlap, just return the more specific (larger mask)
         if (LispAddressUtil.getIpPrefixMask(nbPrefix) < LispAddressUtil.getIpPrefixMask(sbPrefix)) {
             return sbPrefix;
-        } else{
+        } else {
             return nbPrefix;
         }
     }
@@ -308,7 +306,7 @@ public class MappingSystem implements IMappingSystem {
 
 
     /**
-     * Restore all mappings and keys from mdsal datastore
+     * Restore all mappings and keys from mdsal datastore.
      */
     private void restoreDaoFromDatastore() {
         List<Mapping> mappings = dsbe.getAllMappings();
diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/config/ConfigIni.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/config/ConfigIni.java
index 877d9aa4c..8c97a10c1 100644
--- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/config/ConfigIni.java
+++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/config/ConfigIni.java
@@ -7,12 +7,12 @@
  */
 package org.opendaylight.lispflowmapping.implementation.config;
 
+import org.opendaylight.lispflowmapping.interfaces.mappingservice.IMappingService;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.opendaylight.lispflowmapping.interfaces.mappingservice.IMappingService;
 
 public final class ConfigIni {
 
@@ -42,10 +42,10 @@ public final class ConfigIni {
     private static final ConfigIni INSTANCE = new ConfigIni();
 
     private ConfigIni() {
-        Bundle b = FrameworkUtil.getBundle(this.getClass());
+        Bundle bundle = FrameworkUtil.getBundle(this.getClass());
         BundleContext context = null;
-        if (b != null) {
-            context = b.getBundleContext();
+        if (bundle != null) {
+            context = bundle.getBundleContext();
         }
 
         // Initialize mappingMerge first, since mappingOverwrite depends on it
@@ -70,8 +70,8 @@ public final class ConfigIni {
         if (str == null) {
             str = System.getProperty(LISP_REGISTER_VALIDITY_SB);
             if (str == null) {
-                LOG.debug("Configuration variable '{}' is unset. Setting to default value: '3.33 minutes' "
-                        , LISP_REGISTER_VALIDITY_SB);
+                LOG.debug("Configuration variable '{}' is unset. Setting to default value: '3.33 minutes' ",
+                        LISP_REGISTER_VALIDITY_SB);
                 return;
             }
         }
@@ -81,8 +81,7 @@ public final class ConfigIni {
             if (regValidity >= MIN_REGISTRATION_VALIDITY_SB) {
                 this.registrationValiditySb = regValidity;
             }
-        }
-        catch (NumberFormatException e) {
+        } catch (NumberFormatException e) {
             this.registrationValiditySb = MIN_REGISTRATION_VALIDITY_SB;
             LOG.debug("Configuration variable 'registerValiditySb' was not set correctly. Registration validity for"
                     + "South Bound Map Registers is set to default value of 3.3 minutes");
@@ -280,7 +279,7 @@ public final class ConfigIni {
     }
 
     public void setLookupPolicy(IMappingService.LookupPolicy lookupPolicy) {
-            this.lookupPolicy = lookupPolicy;
+        this.lookupPolicy = lookupPolicy;
     }
 
     public static ConfigIni getInstance() {
diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolver.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolver.java
index 8f4f0a0a1..7b983cb06 100644
--- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolver.java
+++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolver.java
@@ -119,16 +119,16 @@ public class MapResolver implements IMapResolverAsync {
 
     private static boolean isEqualIpVersion(IpAddressBinary srcRloc, Rloc rloc) {
         if (srcRloc.getIpv4AddressBinary() != null) {
-            if (rloc.getAddressType() == Ipv4Afi.class ||
-                    rloc.getAddressType() == Ipv4BinaryAfi.class ||
-                    rloc.getAddressType() == Ipv4PrefixAfi.class ||
-                    rloc.getAddressType() == Ipv4PrefixBinaryAfi.class) {
+            if (rloc.getAddressType() == Ipv4Afi.class
+                    || rloc.getAddressType() == Ipv4BinaryAfi.class
+                    || rloc.getAddressType() == Ipv4PrefixAfi.class
+                    || rloc.getAddressType() == Ipv4PrefixBinaryAfi.class) {
                 return true;
             }
-        } else if (rloc.getAddressType() == Ipv6Afi.class ||
-                rloc.getAddressType() == Ipv6BinaryAfi.class ||
-                rloc.getAddressType() == Ipv6PrefixAfi.class ||
-                rloc.getAddressType() == Ipv6PrefixBinaryAfi.class) {
+        } else if (rloc.getAddressType() == Ipv6Afi.class
+                || rloc.getAddressType() == Ipv6BinaryAfi.class
+                || rloc.getAddressType() == Ipv6PrefixAfi.class
+                || rloc.getAddressType() == Ipv6PrefixBinaryAfi.class) {
             return true;
         }
         return false;
@@ -171,8 +171,8 @@ public class MapResolver implements IMapResolverAsync {
         MappingRecordBuilder recordBuilder = new MappingRecordBuilder();
         recordBuilder.setAuthoritative(false);
         recordBuilder.setMapVersion((short) 0);
-        if (eid.getAddressType().equals(Ipv4PrefixBinaryAfi.class) ||
-                eid.getAddressType().equals(Ipv6PrefixBinaryAfi.class)) {
+        if (eid.getAddressType().equals(Ipv4PrefixBinaryAfi.class)
+                || eid.getAddressType().equals(Ipv6PrefixBinaryAfi.class)) {
             recordBuilder.setEid(mapService.getWidestNegativePrefix(eid));
         } else {
             recordBuilder.setEid(eid);
@@ -313,9 +313,9 @@ public class MapResolver implements IMapResolverAsync {
                 Address hopAddress = LispAddressUtil.addressFromSimpleAddress(hop.getAddress());
                 for (ItrRloc itrRloc : itrRlocs) {
                     if (itrRloc.getRloc().getAddress().equals(hopAddress)) {
-                        int i = hops.indexOf(hop);
-                        if (i < hops.size() - 1) {
-                            nextHop = hops.get(i + 1).getAddress();
+                        int iterator = hops.indexOf(hop);
+                        if (iterator < hops.size() - 1) {
+                            nextHop = hops.get(iterator + 1).getAddress();
                             return nextHop;
                         }
                     }
diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapServer.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapServer.java
index 5faea8bf8..e54f705b3 100644
--- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapServer.java
+++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapServer.java
@@ -8,6 +8,7 @@
 
 package org.opendaylight.lispflowmapping.implementation.lisp;
 
+import com.google.common.base.Preconditions;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.net.SocketException;
@@ -20,7 +21,6 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 import org.apache.commons.lang3.BooleanUtils;
-import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.opendaylight.controller.md.sal.binding.api.NotificationService;
 import org.opendaylight.lispflowmapping.implementation.config.ConfigIni;
 import org.opendaylight.lispflowmapping.interfaces.dao.SubKeys;
@@ -58,7 +58,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev15090
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.OdlMappingserviceListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import com.google.common.base.Preconditions;
 
 public class MapServer implements IMapServerAsync, OdlMappingserviceListener {
 
@@ -109,8 +108,8 @@ public class MapServer implements IMapServerAsync, OdlMappingserviceListener {
             mapService.addMapping(MappingOrigin.Southbound, mapping.getEid(), getSiteId(mapRegister), mapping, merge);
 
             if (subscriptionService) {
-                MappingRecord newMapping = merge ?
-                        (MappingRecord) mapService.getMapping(MappingOrigin.Southbound, mapping.getEid()) : mapping;
+                MappingRecord newMapping = merge
+                        ? (MappingRecord) mapService.getMapping(MappingOrigin.Southbound, mapping.getEid()) : mapping;
 
                 if (mappingChanged(oldMapping, newMapping)) {
                     if (LOG.isDebugEnabled()) {
@@ -150,8 +149,8 @@ public class MapServer implements IMapServerAsync, OdlMappingserviceListener {
                 MapNotifyBuilderHelper.setFromMapRegister(builder, mapRegister);
             }
             List<MappingRecordItem> mappings = builder.getMappingRecordItem();
-            if (mappings != null && mappings.get(0) != null && mappings.get(0).getMappingRecord() != null &&
-                    mappings.get(0).getMappingRecord().getEid() != null) {
+            if (mappings != null && mappings.get(0) != null && mappings.get(0).getMappingRecord() != null
+                    && mappings.get(0).getMappingRecord().getEid() != null) {
                 MappingAuthkey authkey = mapService.getAuthenticationKey(mappings.get(0).getMappingRecord().getEid());
                 if (authkey != null) {
                     builder.setAuthenticationData(LispAuthenticationUtil.createAuthenticationData(builder.build(),
@@ -226,6 +225,7 @@ public class MapServer implements IMapServerAsync, OdlMappingserviceListener {
         }
     }
 
+    @SuppressWarnings("checkstyle:IllegalCatch")
     private void handleSmr(Eid eid, Set<SubscriberRLOC> subscribers, IMapNotifyHandler callback) {
         if (subscribers == null) {
             return;
@@ -248,7 +248,7 @@ public class MapServer implements IMapServerAsync, OdlMappingserviceListener {
                     mrb.getEidItem().add(new EidItemBuilder().setEid(subscriber.getSrcEid()).build());
                     callback.handleSMR(mrb.build(), subscriber.getSrcRloc());
                 } catch (Exception e) {
-                    LOG.error("Errors encountered while handling SMR:" + ExceptionUtils.getStackTrace(e));
+                    LOG.error("Errors encountered while handling SMR:", e);
                 }
             }
         }
@@ -279,13 +279,13 @@ public class MapServer implements IMapServerAsync, OdlMappingserviceListener {
                 }
                 Enumeration<InetAddress> addresses = current.getInetAddresses();
                 while (addresses.hasMoreElements()) {
-                    InetAddress current_addr = addresses.nextElement();
+                    InetAddress currentAddr = addresses.nextElement();
                     // Skip loopback and link local addresses
-                    if (current_addr.isLoopbackAddress() || current_addr.isLinkLocalAddress()) {
+                    if (currentAddr.isLoopbackAddress() || currentAddr.isLinkLocalAddress()) {
                         continue;
                     }
-                    LOG.debug(current_addr.getHostAddress());
-                    return current_addr;
+                    LOG.debug(currentAddr.getHostAddress());
+                    return currentAddr;
                 }
             }
         } catch (SocketException se) {
diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mdsal/AuthenticationKeyDataListener.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mdsal/AuthenticationKeyDataListener.java
index 2c09cbd71..afa59841f 100644
--- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mdsal/AuthenticationKeyDataListener.java
+++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mdsal/AuthenticationKeyDataListener.java
@@ -8,9 +8,9 @@
 package org.opendaylight.lispflowmapping.implementation.mdsal;
 
 import java.util.Collection;
-
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
+import org.opendaylight.controller.md.sal.binding.api.DataObjectModification.ModificationType;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeModification;
 import org.opendaylight.lispflowmapping.interfaces.mapcache.IMappingSystem;
 import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
@@ -22,7 +22,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev15090
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.opendaylight.controller.md.sal.binding.api.DataObjectModification.ModificationType;
 
 /**
  * DataListener for all AuthenticationKey modification events.
diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mdsal/MappingDataListener.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mdsal/MappingDataListener.java
index d094897b8..9c0f30a78 100644
--- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mdsal/MappingDataListener.java
+++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/mdsal/MappingDataListener.java
@@ -10,7 +10,6 @@ package org.opendaylight.lispflowmapping.implementation.mdsal;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
 import org.opendaylight.controller.md.sal.binding.api.DataObjectModification.ModificationType;
@@ -144,8 +143,8 @@ public class MappingDataListener extends AbstractDataListener<Mapping> {
             convertedLocators = convertToBinaryIfNecessary(originalLocators);
         }
 
-        if (LispAddressUtil.addressNeedsConversionToBinary(originalRecord.getEid().getAddress()) ||
-                (originalLocators != null && convertedLocators != null)) {
+        if (LispAddressUtil.addressNeedsConversionToBinary(originalRecord.getEid().getAddress())
+                || (originalLocators != null && convertedLocators != null)) {
             MappingRecordBuilder mrb = new MappingRecordBuilder(originalRecord);
             mrb.setEid(LispAddressUtil.convertToBinary(originalRecord.getEid()));
             if (convertedLocators != null) {
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 2f0e26605..4de2fe4bf 100644
--- 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
@@ -10,7 +10,6 @@ package org.opendaylight.lispflowmapping.implementation.util;
 
 import java.util.Arrays;
 import java.util.List;
-
 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;
@@ -28,6 +27,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev15090
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.mapping.XtrIdMappingBuilder;
 
 /**
+ * DataStoreBackEnd utilities.
+ *
  * @author Florin Coras
  *
  */
diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/LispNotificationHelper.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/LispNotificationHelper.java
index f79a7cf6a..56519d8a2 100644
--- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/LispNotificationHelper.java
+++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/LispNotificationHelper.java
@@ -9,15 +9,22 @@ package org.opendaylight.lispflowmapping.implementation.util;
 
 import com.google.common.base.Splitter;
 import com.google.common.net.InetAddresses;
-
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-
 import org.opendaylight.lispflowmapping.lisp.type.LispMessage;
 import org.opendaylight.lispflowmapping.lisp.util.LispAddressStringifier;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.SimpleAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.Address;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.ApplicationData;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.DistinguishedName;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv4;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv6;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.KeyValueAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.IpAddressBinary;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.IpAddressBinaryBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.Ipv4AddressBinary;
@@ -35,15 +42,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev15090
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.MappingOrigin;
 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;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.SimpleAddress;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.Address;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.ApplicationData;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.DistinguishedName;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv4;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv6;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.KeyValueAddress;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -103,19 +101,19 @@ public final class LispNotificationHelper {
         return tab.build();
     }
 
-    public static InetAddress getAddressByName(String IPAddress) {
+    public static InetAddress getAddressByName(String ipAddress) {
         try {
-            InetAddress address = InetAddress.getByName(IPAddress);
+            InetAddress address = InetAddress.getByName(ipAddress);
             return address;
         } catch (UnknownHostException e) {
-            LOG.debug("Unknown host {}", IPAddress, e);
+            LOG.debug("Unknown host {}", ipAddress, e);
             return null;
         }
     }
 
     public static List<Mapping> getMapping(AddMapping mapRegisterNotification) {
         List<Mapping> mappings = new ArrayList<Mapping>();
-        for (int i=0; i<mapRegisterNotification.getMapRegister().getMappingRecordItem().size(); i++) {
+        for (int i = 0; i < mapRegisterNotification.getMapRegister().getMappingRecordItem().size(); i++) {
             MappingRecord record = mapRegisterNotification.getMapRegister().getMappingRecordItem().get(i)
                     .getMappingRecord();
             MappingBuilder mb = new MappingBuilder();
diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/MSNotificationInputUtil.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/MSNotificationInputUtil.java
index 1bef9d819..c68b855c6 100644
--- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/MSNotificationInputUtil.java
+++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/MSNotificationInputUtil.java
@@ -14,6 +14,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev15090
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.db.instance.Mapping;
 
 /**
+ * Utility class to convert a mapping change into a notification.
+ *
  * @author Florin Coras
  *
  */
diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/MappingMergeUtil.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/MappingMergeUtil.java
index f838ec196..7455e4623 100644
--- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/MappingMergeUtil.java
+++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/MappingMergeUtil.java
@@ -7,12 +7,16 @@
  */
 package org.opendaylight.lispflowmapping.implementation.util;
 
+import com.google.common.base.Preconditions;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
+import org.opendaylight.lispflowmapping.implementation.config.ConfigIni;
+import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
+import org.opendaylight.lispflowmapping.lisp.util.MaskUtil;
+import org.opendaylight.lispflowmapping.lisp.util.SourceDestKeyHelper;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefix;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix;
@@ -20,10 +24,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.addres
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.Address;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.source.dest.key.SourceDestKey;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.source.dest.key.SourceDestKeyBuilder;
-import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
-import org.opendaylight.lispflowmapping.lisp.util.MaskUtil;
-import org.opendaylight.lispflowmapping.lisp.util.SourceDestKeyHelper;
-import org.opendaylight.lispflowmapping.implementation.config.ConfigIni;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.locatorrecords.LocatorRecord;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.locatorrecords.LocatorRecordBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecord;
@@ -32,10 +32,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rl
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Preconditions;
-
 /**
- * Utility class to implement merging of locator sets
+ * Utility class to implement merging of locator sets.
  *
  * @author Lorand Jakab
  *
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 150ac80ce..43f96270a 100644
--- 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
@@ -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())));
diff --git a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/LispMappingServiceTest.java b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/LispMappingServiceTest.java
index 3c53ebbea..f6dbf46a2 100644
--- a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/LispMappingServiceTest.java
+++ b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/LispMappingServiceTest.java
@@ -11,11 +11,9 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
 import com.google.common.collect.Lists;
-
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.MutablePair;
 import org.apache.commons.lang3.tuple.Pair;
@@ -39,6 +37,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.Ad
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.GotMapNotify;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.GotMapReply;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.MapNotify;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.MapRegister;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.MapReply;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.MappingKeepAlive;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.RequestMapping;
@@ -46,20 +45,13 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.Xt
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.XtrRequestMapping;
 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.eid.list.EidItemBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.MapRegister;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.map.register.cache.metadata.container
-        .MapRegisterCacheMetadata;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.map.register.cache.metadata.container
-        .MapRegisterCacheMetadataBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.map.register.cache.metadata.container
-        .map.register.cache.metadata.EidLispAddress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.map.register.cache.metadata.container
-        .map.register.cache.metadata.EidLispAddressBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.map.register.cache.metadata.container.MapRegisterCacheMetadata;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.map.register.cache.metadata.container.MapRegisterCacheMetadataBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.map.register.cache.metadata.container.map.register.cache.metadata.EidLispAddress;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.map.register.cache.metadata.container.map.register.cache.metadata.EidLispAddressBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapnotifymessage.MapNotifyBuilder;
-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.record.list.
-        MappingRecordItemBuilder;
+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.record.list.MappingRecordItemBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapreplymessage.MapReplyBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.maprequest.SourceEidBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.maprequestmessage.MapRequest;
diff --git a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/MappingSystemTest.java b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/MappingSystemTest.java
index cffea48f7..d0a408150 100644
--- a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/MappingSystemTest.java
+++ b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/MappingSystemTest.java
@@ -26,8 +26,8 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.runners.MockitoJUnitRunner;
-import org.opendaylight.lispflowmapping.implementation.config.ConfigIni;
 import org.opendaylight.lispflowmapping.dsbackend.DataStoreBackEnd;
+import org.opendaylight.lispflowmapping.implementation.config.ConfigIni;
 import org.opendaylight.lispflowmapping.implementation.util.MappingMergeUtil;
 import org.opendaylight.lispflowmapping.inmemorydb.HashMapDb;
 import org.opendaylight.lispflowmapping.interfaces.dao.ILispDAO;
@@ -37,35 +37,27 @@ import org.opendaylight.lispflowmapping.interfaces.mappingservice.IMappingServic
 import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
-        .ExplicitLocatorPathLcaf;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.ExplicitLocatorPathLcaf;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.Ipv4PrefixAfi;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.ServicePathIdType;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.SimpleAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.Address;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
-        .address.ExplicitLocatorPath;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
-        .address.ExplicitLocatorPathBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
-        .address.Ipv4PrefixBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
-        .address.ServicePath;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
-        .address.ServicePathBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
-        .address.explicit.locator.path.explicit.locator.path.Hop;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
-        .address.explicit.locator.path.explicit.locator.path.HopBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address
-        .address.Ipv4Binary;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.ExplicitLocatorPath;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.ExplicitLocatorPathBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv4PrefixBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.ServicePath;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.ServicePathBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.explicit.locator.path.explicit.locator.path.Hop;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.explicit.locator.path.explicit.locator.path.HopBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.types.rev160504.augmented.lisp.address.address.Ipv4Binary;
 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.eid.container.EidBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.locatorrecords.LocatorRecordBuilder;
+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.authkey.container.MappingAuthkeyBuilder;
 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.record.container.MappingRecordBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.Rloc;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.RlocBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.EidUri;
@@ -74,10 +66,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev15090
 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;
-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.authkey.container
-        .MappingAuthkeyBuilder;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
@@ -141,9 +129,6 @@ public class MappingSystemTest {
 
     /**
      * This method injects mocks which can not be injected the usual way using Mockito.
-     *
-     * @throws NoSuchFieldException
-     * @throws IllegalAccessException
      */
     private static void injectMocks() throws NoSuchFieldException, IllegalAccessException {
         final Field smcField = MappingSystem.class.getDeclaredField("smc");
@@ -161,9 +146,6 @@ public class MappingSystemTest {
 
     /**
      * This method changes the lookup policy.
-     *
-     * @throws NoSuchFieldException
-     * @throws IllegalAccessException
      */
     private static void setLookupPolicy(IMappingService.LookupPolicy policy) throws NoSuchFieldException,
             IllegalAccessException {
diff --git a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MapServerTest.java b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MapServerTest.java
index a20034517..953924f29 100644
--- a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MapServerTest.java
+++ b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MapServerTest.java
@@ -45,6 +45,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.lo
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.locatorrecords.LocatorRecordBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapnotifymessage.MapNotify;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapnotifymessage.MapNotifyBuilder;
+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.authkey.container.MappingAuthkeyBuilder;
 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.record.list.MappingRecordItem;
@@ -56,8 +58,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rl
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.transport.address.TransportAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.transport.address.TransportAddressBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.MappingOrigin;
-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.authkey.container.MappingAuthkeyBuilder;
 
 @RunWith(MockitoJUnitRunner.class)
 public class MapServerTest {
@@ -501,17 +501,17 @@ public class MapServerTest {
     }
 
     private static List<TransportAddress> getTransportAddressList() {
-        TransportAddressBuilder transportAddressBuilder_1 = new TransportAddressBuilder()
+        TransportAddressBuilder transportAddressBuilder1 = new TransportAddressBuilder()
                 .setIpAddress(IPV4_BINARY_1)
                 .setPort(new PortNumber(LispMessage.PORT_NUM));
 
-        TransportAddressBuilder transportAddressBuilder_2 = new TransportAddressBuilder()
+        TransportAddressBuilder transportAddressBuilder2 = new TransportAddressBuilder()
                 .setIpAddress(IPV4_BINARY_2)
                 .setPort(new PortNumber(LispMessage.PORT_NUM));
 
         final List<TransportAddress> transportAddressList = Lists.newArrayList(
-                transportAddressBuilder_1.build(),
-                transportAddressBuilder_2.build());
+                transportAddressBuilder1.build(),
+                transportAddressBuilder2.build());
 
         return transportAddressList;
     }
diff --git a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MappingServiceTest.java b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MappingServiceTest.java
index a961bbf44..ac4f1032c 100644
--- a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MappingServiceTest.java
+++ b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/lisp/MappingServiceTest.java
@@ -13,7 +13,6 @@ import static org.junit.Assert.assertNull;
 import java.util.ArrayList;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
@@ -22,10 +21,10 @@ import org.mockito.Mockito;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
+import org.opendaylight.lispflowmapping.dsbackend.DataStoreBackEnd;
 import org.opendaylight.lispflowmapping.implementation.MappingService;
 import org.opendaylight.lispflowmapping.implementation.MappingSystem;
 import org.opendaylight.lispflowmapping.implementation.mdsal.AuthenticationKeyDataListener;
-import org.opendaylight.lispflowmapping.dsbackend.DataStoreBackEnd;
 import org.opendaylight.lispflowmapping.implementation.mdsal.MappingDataListener;
 import org.opendaylight.lispflowmapping.implementation.util.DSBEInputUtil;
 import org.opendaylight.lispflowmapping.implementation.util.RPCInputConvertorUtil;
@@ -36,9 +35,10 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.
 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.authkey.container.MappingAuthkeyBuilder;
 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.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.AddKeyInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.AddKeysInput;
@@ -67,10 +67,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev15090
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.UpdateMappingInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.UpdateMappingInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.UpdateMappingsInput;
-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.authkey.container
-        .MappingAuthkeyBuilder;
 import org.opendaylight.yangtools.yang.common.RpcError;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
@@ -105,9 +101,6 @@ public class MappingServiceTest {
 
     /**
      * Tests {@link MappingService#addKey} method.
-     *
-     * @throws ExecutionException
-     * @throws InterruptedException
      */
     @Test
     public void addKeyTest() throws ExecutionException, InterruptedException {
@@ -142,9 +135,6 @@ public class MappingServiceTest {
 
     /**
      * Tests {@link MappingService#addKey} method with null MappingAuthkey.
-     *
-     * @throws ExecutionException
-     * @throws InterruptedException
      */
     @Test
     public void addKeyTest_withNullMapAuthkey() throws ExecutionException, InterruptedException {
@@ -161,9 +151,6 @@ public class MappingServiceTest {
 
     /**
      * Tests {@link MappingService#addMapping} method.
-     *
-     * @throws ExecutionException
-     * @throws InterruptedException
      */
     @Test
     public void addMappingTest() throws ExecutionException, InterruptedException {
@@ -181,9 +168,6 @@ public class MappingServiceTest {
 
     /**
      * Tests {@link MappingService#getKey} method.
-     *
-     * @throws ExecutionException
-     * @throws InterruptedException
      */
     @Test
     public void getKeyTest() throws ExecutionException, InterruptedException {
@@ -201,9 +185,6 @@ public class MappingServiceTest {
 
     /**
      * Tests {@link MappingService#getKey} method with null MappingAuthkey.
-     *
-     * @throws ExecutionException
-     * @throws InterruptedException
      */
     @Test
     public void getKeyTest_withNullMappingAuthkey() throws ExecutionException, InterruptedException {
@@ -234,9 +215,6 @@ public class MappingServiceTest {
 
     /**
      * Tests {@link MappingService#getMapping} method.
-     *
-     * @throws ExecutionException
-     * @throws InterruptedException
      */
     @Test
     public void getMappingTest() throws ExecutionException, InterruptedException {
@@ -262,9 +240,6 @@ public class MappingServiceTest {
 
     /**
      * Tests {@link MappingService#getMapping} method with null MappingRecord.
-     *
-     * @throws ExecutionException
-     * @throws InterruptedException
      */
     @Test
     public void getMappingTest_withNullMapRecord() throws ExecutionException, InterruptedException {
@@ -294,9 +269,6 @@ public class MappingServiceTest {
 
     /**
      * Tests {@link MappingService#removeKey} method.
-     *
-     * @throws ExecutionException
-     * @throws InterruptedException
      */
     @Test
     public void removeKeyTest() throws ExecutionException, InterruptedException {
@@ -312,9 +284,6 @@ public class MappingServiceTest {
 
     /**
      * Tests {@link MappingService#removeMapping} method.
-     *
-     * @throws ExecutionException
-     * @throws InterruptedException
      */
     @Test
     public void removeMappingTest() throws ExecutionException, InterruptedException {
@@ -330,9 +299,6 @@ public class MappingServiceTest {
 
     /**
      * Tests {@link MappingService#updateKey} method.
-     *
-     * @throws ExecutionException
-     * @throws InterruptedException
      */
     @Test
     public void updateKeyTest() throws ExecutionException, InterruptedException {
@@ -349,9 +315,6 @@ public class MappingServiceTest {
 
     /**
      * Tests {@link MappingService#updateKey} method with null MappingAuthkey.
-     *
-     * @throws ExecutionException
-     * @throws InterruptedException
      */
     @Test
     public void updateKeyTest_withNullMapAuthkey() throws ExecutionException, InterruptedException {
@@ -381,9 +344,6 @@ public class MappingServiceTest {
 
     /**
      * Tests {@link MappingService#updateMapping} method.
-     *
-     * @throws ExecutionException
-     * @throws InterruptedException
      */
     @Test
     public void updateMappingTest() throws ExecutionException, InterruptedException {
@@ -401,9 +361,6 @@ public class MappingServiceTest {
 
     /**
      * Tests {@link MappingService#addMapping} method from southbound.
-     *
-     * @throws ExecutionException
-     * @throws InterruptedException
      */
     @Test
     public void addMappingTest_fromSouthbound() throws ExecutionException, InterruptedException {
@@ -420,9 +377,6 @@ public class MappingServiceTest {
 
     /**
      * Tests {@link MappingService#addMapping} method from northbound.
-     *
-     * @throws ExecutionException
-     * @throws InterruptedException
      */
     @Test
     public void addMappingTest_fromNorthbound() throws ExecutionException, InterruptedException {
@@ -584,4 +538,4 @@ public class MappingServiceTest {
                 .setRecordTtl(60)
                 .setEid(IPV4_EID);
     }
-}
+}
\ No newline at end of file
diff --git a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/mdsal/AuthenticationKeyDataListenerTest.java b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/mdsal/AuthenticationKeyDataListenerTest.java
index 052d7fb2c..342895410 100644
--- a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/mdsal/AuthenticationKeyDataListenerTest.java
+++ b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/mdsal/AuthenticationKeyDataListenerTest.java
@@ -7,8 +7,6 @@
  */
 package org.opendaylight.lispflowmapping.implementation.mdsal;
 
-import static org.opendaylight.controller.md.sal.binding.api.DataObjectModification.ModificationType;
-
 import com.google.common.collect.Lists;
 import java.util.List;
 import org.junit.Before;
@@ -16,16 +14,16 @@ import org.junit.Test;
 import org.mockito.Mockito;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
+import org.opendaylight.controller.md.sal.binding.api.DataObjectModification.ModificationType;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeModification;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.lispflowmapping.interfaces.mapcache.IMappingSystem;
 import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
 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.MappingAuthkeyBuilder;
 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.lisp.proto.rev151105.mapping.authkey.container
-        .MappingAuthkeyBuilder;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 public class AuthenticationKeyDataListenerTest {
diff --git a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/mdsal/MappingDataListenerTest.java b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/mdsal/MappingDataListenerTest.java
index 773c41c2c..30e962427 100644
--- a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/mdsal/MappingDataListenerTest.java
+++ b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/mdsal/MappingDataListenerTest.java
@@ -7,8 +7,6 @@
  */
 package org.opendaylight.lispflowmapping.implementation.mdsal;
 
-import static org.opendaylight.controller.md.sal.binding.api.DataObjectModification.ModificationType;
-
 import com.google.common.collect.Lists;
 import java.util.List;
 import org.junit.Before;
@@ -16,6 +14,7 @@ import org.junit.Test;
 import org.mockito.Mockito;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
+import org.opendaylight.controller.md.sal.binding.api.DataObjectModification.ModificationType;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeModification;
 import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
@@ -25,8 +24,7 @@ import org.opendaylight.lispflowmapping.interfaces.mapcache.IMappingSystem;
 import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
 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.record.container.MappingRecordBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.MappingChange;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.MappingChanged;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.MappingOrigin;
@@ -95,15 +93,13 @@ public class MappingDataListenerTest {
 
     /**
      * Tests {@link MappingDataListener#onDataTreeChanged} method with DELETE modification type from northbound.
-     *
-     * @throws InterruptedException
      */
     @Test
     @SuppressWarnings("unchecked")
     public void onDataTreeChangedTest_delete_NB() throws InterruptedException {
         final List<DataTreeModification<Mapping>> changes = Lists.newArrayList(change_del);
-        final MappingChanged mapChanged = MSNotificationInputUtil.
-                toMappingChanged(MAPPING_EID_1_NB, MappingChange.Removed);
+        final MappingChanged mapChanged = MSNotificationInputUtil
+                .toMappingChanged(MAPPING_EID_1_NB, MappingChange.Removed);
         Mockito.when(mod_del.getDataBefore()).thenReturn(MAPPING_EID_1_NB);
 
         mappingDataListener.onDataTreeChanged(changes);
@@ -128,15 +124,13 @@ public class MappingDataListenerTest {
     /**
      * Tests {@link MappingDataListener#onDataTreeChanged} method with SUBTREE_MODIFIED modification type from
      * northbound.
-     *
-     * @throws InterruptedException
      */
     @Test
     @SuppressWarnings("unchecked")
     public void onDataTreeChangedTest_subtreeModified_NB() throws InterruptedException {
         final List<DataTreeModification<Mapping>> changes = Lists.newArrayList(change_subtreeModified);
-        final MappingChanged mapChanged = MSNotificationInputUtil.
-                toMappingChanged(MAPPING_EID_2_NB, MappingChange.Updated);
+        final MappingChanged mapChanged = MSNotificationInputUtil
+                .toMappingChanged(MAPPING_EID_2_NB, MappingChange.Updated);
         Mockito.when(mod_subtreeModified.getDataAfter()).thenReturn(MAPPING_EID_2_NB);
 
         mappingDataListener.onDataTreeChanged(changes);
@@ -162,8 +156,6 @@ public class MappingDataListenerTest {
 
     /**
      * Tests {@link MappingDataListener#onDataTreeChanged} method with WRITE modification type from northbound.
-     *
-     * @throws InterruptedException
      */
     @Test
     @SuppressWarnings("unchecked")
@@ -195,8 +187,6 @@ public class MappingDataListenerTest {
 
     /**
      * Tests {@link MappingDataListener#onDataTreeChanged} method with multiple changes.
-     *
-     * @throws InterruptedException
      */
     @Test
     @SuppressWarnings("unchecked")
diff --git a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/util/LispNotificationHelperTest.java b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/util/LispNotificationHelperTest.java
index f549cb973..bd47eccd6 100644
--- a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/util/LispNotificationHelperTest.java
+++ b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/util/LispNotificationHelperTest.java
@@ -25,18 +25,12 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.DistinguishedNameType;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.SimpleAddress;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
-        .address.ApplicationData;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
-        .address.ApplicationDataBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
-        .address.DistinguishedNameBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
-        .address.Ipv4PrefixBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
-        .address.KeyValueAddress;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
-        .address.KeyValueAddressBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.ApplicationData;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.ApplicationDataBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.DistinguishedNameBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv4PrefixBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.KeyValueAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.KeyValueAddressBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.IpAddressBinary;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.Ipv4AddressBinary;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.Ipv6AddressBinary;
@@ -44,13 +38,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.Ad
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.AddMappingBuilder;
 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.record.container
-        .MappingRecordBuilder;
+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.record.list.MappingRecordItem;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.list
-        .MappingRecordItemBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapregisternotification
-        .MapRegisterBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.list.MappingRecordItemBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapregisternotification.MapRegisterBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.Rloc;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.RlocBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.transport.address.TransportAddress;
@@ -66,10 +57,10 @@ public class LispNotificationHelperTest {
 
     private static final Ipv4Address ADDRESS_IPV4 = new Ipv4Address(IPV4_STRING);
     private static final Ipv6Address ADDRESS_IPV6 = new Ipv6Address(IPV6_STRING);
-    private static final Ipv4AddressBinary ADDRESS_IPV4_BINARY = new Ipv4AddressBinary(InetAddresses.
-            forString(IPV4_STRING).getAddress());
-    private static final Ipv6AddressBinary ADDRESS_IPV6_BINARY = new Ipv6AddressBinary(InetAddresses.
-            forString(IPV6_STRING).getAddress());
+    private static final Ipv4AddressBinary ADDRESS_IPV4_BINARY = new Ipv4AddressBinary(InetAddresses
+            .forString(IPV4_STRING).getAddress());
+    private static final Ipv6AddressBinary ADDRESS_IPV6_BINARY = new Ipv6AddressBinary(InetAddresses
+            .forString(IPV6_STRING).getAddress());
 
     private static final int PORT = 9999;
     private static final DistinguishedNameType DISTINGUISHED_NAME_TYPE =
diff --git a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/util/MappingMergeUtilTest.java b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/util/MappingMergeUtilTest.java
index cb3bd7646..8661a5992 100644
--- a/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/util/MappingMergeUtilTest.java
+++ b/mappingservice/implementation/src/test/java/org/opendaylight/lispflowmapping/implementation/util/MappingMergeUtilTest.java
@@ -15,7 +15,6 @@ import static org.junit.Assert.assertTrue;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
-
 import org.junit.Test;
 import org.opendaylight.lispflowmapping.implementation.config.ConfigIni;
 import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
@@ -27,8 +26,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.ei
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.locatorrecords.LocatorRecord;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.locatorrecords.LocatorRecordBuilder;
 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.record.container.MappingRecordBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.Rloc;
 
 public class MappingMergeUtilTest {
@@ -106,12 +104,12 @@ public class MappingMergeUtilTest {
      */
     @Test
     public void computeNbSbIntersectionTest_withMaskableIpv4PrefixEIDs_() {
-        MappingRecord NBmappingRecord = getDefaultMappingRecordBuilder().setEid(IPV4_PREFIX_EID_1).build();
-        MappingRecord SBmappingRecord = getDefaultMappingRecordBuilder().setEid(IPV4_PREFIX_EID_2).build();
+        MappingRecord nbMappingRecord = getDefaultMappingRecordBuilder().setEid(IPV4_PREFIX_EID_1).build();
+        MappingRecord sbMappingRecord = getDefaultMappingRecordBuilder().setEid(IPV4_PREFIX_EID_2).build();
 
         // result
         MappingRecord result = (MappingRecord) MappingMergeUtil
-                .computeNbSbIntersection(NBmappingRecord, SBmappingRecord);
+                .computeNbSbIntersection(nbMappingRecord, sbMappingRecord);
 
         assertEquals(IPV4_PREFIX_EID_1, result.getEid());
     }
@@ -121,12 +119,12 @@ public class MappingMergeUtilTest {
      */
     @Test
     public void computeNbSbIntersectionTest_withMaskableIpv4PrefixEIDs() {
-        MappingRecord NBmappingRecord = getDefaultMappingRecordBuilder().setEid(IPV4_PREFIX_EID_2).build();
-        MappingRecord SBmappingRecord = getDefaultMappingRecordBuilder().setEid(IPV4_PREFIX_EID_1).build();
+        MappingRecord nbMappingRecord = getDefaultMappingRecordBuilder().setEid(IPV4_PREFIX_EID_2).build();
+        MappingRecord sbMappingRecord = getDefaultMappingRecordBuilder().setEid(IPV4_PREFIX_EID_1).build();
 
         // result
         MappingRecord result = (MappingRecord) MappingMergeUtil
-                .computeNbSbIntersection(NBmappingRecord, SBmappingRecord);
+                .computeNbSbIntersection(nbMappingRecord, sbMappingRecord);
 
         assertEquals(IPV4_PREFIX_EID_1, result.getEid());
     }
@@ -137,12 +135,12 @@ public class MappingMergeUtilTest {
      */
     @Test
     public void computeNbSbIntersectionTest_withMaskableSourceDestKeyEIDs_Ipv4SB() {
-        MappingRecord NBmappingRecord = getDefaultMappingRecordBuilder().setEid(SOURCE_DEST_KEY_EID_1).build();
-        MappingRecord SBmappingRecord = getDefaultMappingRecordBuilder().setEid(IPV4_PREFIX_EID_1).build();
+        MappingRecord nbMappingRecord = getDefaultMappingRecordBuilder().setEid(SOURCE_DEST_KEY_EID_1).build();
+        MappingRecord sbMappingRecord = getDefaultMappingRecordBuilder().setEid(IPV4_PREFIX_EID_1).build();
 
         // result
         final MappingRecord result = (MappingRecord) MappingMergeUtil
-                .computeNbSbIntersection(NBmappingRecord, SBmappingRecord);
+                .computeNbSbIntersection(nbMappingRecord, sbMappingRecord);
         final Eid eid = LispAddressUtil.asSrcDstEid(IPV4_STRING_3 ,IPV4_STRING_1 ,24 , 24, 1);
 
         assertEquals(eid, result.getEid());
@@ -154,12 +152,12 @@ public class MappingMergeUtilTest {
      */
     @Test
     public void computeNbSbIntersectionTest_withMaskableSourceDestKeyEIDs_Ipv6SB() {
-        MappingRecord NBmappingRecord = getDefaultMappingRecordBuilder().setEid(SOURCE_DEST_KEY_EID_1).build();
-        MappingRecord SBmappingRecord = getDefaultMappingRecordBuilder().setEid(IPV6_PREFIX_EID).build();
+        MappingRecord nbMappingRecord = getDefaultMappingRecordBuilder().setEid(SOURCE_DEST_KEY_EID_1).build();
+        MappingRecord sbMappingRecord = getDefaultMappingRecordBuilder().setEid(IPV6_PREFIX_EID).build();
 
         // result
         final MappingRecord result = (MappingRecord) MappingMergeUtil
-                .computeNbSbIntersection(NBmappingRecord, SBmappingRecord);
+                .computeNbSbIntersection(nbMappingRecord, sbMappingRecord);
         final Eid eid = LispAddressUtil.asSrcDstEid(IPV4_STRING_3 ,IPV6_STRING ,24 , 96, 1);
 
         assertEquals(eid, result.getEid());
@@ -170,12 +168,12 @@ public class MappingMergeUtilTest {
      */
     @Test
     public void getCommonLocatorRecords_withEmptyLocatorRecords() {
-        MappingRecord NBmappingRecord = getDefaultMappingRecordBuilder().setEid(IPV4_EID_2).build();
-        MappingRecord SBmappingRecord = getDefaultMappingRecordBuilder().setEid(IPV4_EID_1).build();
+        MappingRecord nbMappingRecord = getDefaultMappingRecordBuilder().setEid(IPV4_EID_2).build();
+        MappingRecord sbMappingRecord = getDefaultMappingRecordBuilder().setEid(IPV4_EID_1).build();
 
         // result
         MappingRecord result = (MappingRecord) MappingMergeUtil
-                .computeNbSbIntersection(NBmappingRecord, SBmappingRecord);
+                .computeNbSbIntersection(nbMappingRecord, sbMappingRecord);
         assertEquals(0, result.getLocatorRecord().size());
     }
 
@@ -184,12 +182,12 @@ public class MappingMergeUtilTest {
      */
     @Test
     public void getCommonLocatorRecords_withNullLocatorRecords() {
-        MappingRecord NBmappingRecord = getDefaultMappingRecordBuilder().setLocatorRecord(null).build();
-        MappingRecord SBmappingRecord = getDefaultMappingRecordBuilder().setLocatorRecord(null).build();
+        MappingRecord nbMappingRecord = getDefaultMappingRecordBuilder().setLocatorRecord(null).build();
+        MappingRecord sbMappingRecord = getDefaultMappingRecordBuilder().setLocatorRecord(null).build();
 
         // result
         MappingRecord result = (MappingRecord) MappingMergeUtil
-                .computeNbSbIntersection(NBmappingRecord, SBmappingRecord);
+                .computeNbSbIntersection(nbMappingRecord, sbMappingRecord);
         assertNull(result.getLocatorRecord());
     }
 
@@ -199,35 +197,35 @@ public class MappingMergeUtilTest {
      */
     @Test
     public void getCommonLocatorRecords_priorityCheck() {
-        LocatorRecordBuilder NBlocatorRecordBuilder_1 = new LocatorRecordBuilder()
+        LocatorRecordBuilder nbLocatorRecordBuilder1 = new LocatorRecordBuilder()
                 .setRloc(IPV4_RLOC_1)
                 .setPriority((short) 1)
                 .setLocatorId("NB-locator-id");
-        LocatorRecordBuilder SBlocatorRecordBuilder_1 = new LocatorRecordBuilder()
+        LocatorRecordBuilder sbLocatorRecordBuilder1 = new LocatorRecordBuilder()
                 .setRloc(IPV4_RLOC_1)
                 .setPriority((short) 255)
                 .setLocatorId("SB-locator-id");
 
-        LocatorRecordBuilder NBlocatorRecordBuilder_2 = new LocatorRecordBuilder()
+        LocatorRecordBuilder nbLocatorRecordBuilder2 = new LocatorRecordBuilder()
                 .setRloc(IPV4_RLOC_2)
                 .setPriority((short) 1)
                 .setLocatorId("NB-locator-id");
-        LocatorRecordBuilder SBlocatorRecordBuilder_2 = new LocatorRecordBuilder()
+        LocatorRecordBuilder sbLocatorRecordBuilder2 = new LocatorRecordBuilder()
                 .setRloc(IPV4_RLOC_2)
                 .setPriority((short) 254)
                 .setLocatorId("SB-locator-id");
 
-        final MappingRecordBuilder NBmappingRecordBuilder = getDefaultMappingRecordBuilder();
-        NBmappingRecordBuilder.getLocatorRecord().add(NBlocatorRecordBuilder_1.build());
-        NBmappingRecordBuilder.getLocatorRecord().add(NBlocatorRecordBuilder_2.build());
+        final MappingRecordBuilder nbMappingRecordBuilder = getDefaultMappingRecordBuilder();
+        nbMappingRecordBuilder.getLocatorRecord().add(nbLocatorRecordBuilder1.build());
+        nbMappingRecordBuilder.getLocatorRecord().add(nbLocatorRecordBuilder2.build());
 
-        final MappingRecordBuilder SBmappingRecordBuilder = getDefaultMappingRecordBuilder();
-        SBmappingRecordBuilder.getLocatorRecord().add(SBlocatorRecordBuilder_1.build());
-        SBmappingRecordBuilder.getLocatorRecord().add(SBlocatorRecordBuilder_2.build());
+        final MappingRecordBuilder sbMappingRecordBuilder = getDefaultMappingRecordBuilder();
+        sbMappingRecordBuilder.getLocatorRecord().add(sbLocatorRecordBuilder1.build());
+        sbMappingRecordBuilder.getLocatorRecord().add(sbLocatorRecordBuilder2.build());
 
         // result
         final MappingRecord result = (MappingRecord) MappingMergeUtil
-                .computeNbSbIntersection(NBmappingRecordBuilder.build(), SBmappingRecordBuilder.build());
+                .computeNbSbIntersection(nbMappingRecordBuilder.build(), sbMappingRecordBuilder.build());
         final Iterator<LocatorRecord> iterator = result.getLocatorRecord().iterator();
         final LocatorRecord resultLocator_1 = iterator.next();
         final LocatorRecord resultLocator_2 = iterator.next();
diff --git a/mappingservice/mapcache/pom.xml b/mappingservice/mapcache/pom.xml
index a571d310d..5c10ee0bf 100644
--- a/mappingservice/mapcache/pom.xml
+++ b/mappingservice/mapcache/pom.xml
@@ -37,22 +37,6 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <!-- Enforce odlparent checkstyle -->
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-checkstyle-plugin</artifactId>
-          <configuration>
-            <includeTestSourceDirectory>true</includeTestSourceDirectory>
-            <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
   <!--
       Maven Site Configuration
 
diff --git a/mappingservice/neutron/pom.xml b/mappingservice/neutron/pom.xml
index fc96d5d96..b3be8285c 100644
--- a/mappingservice/neutron/pom.xml
+++ b/mappingservice/neutron/pom.xml
@@ -37,22 +37,6 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <!-- Enforce odlparent checkstyle -->
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-checkstyle-plugin</artifactId>
-          <configuration>
-            <includeTestSourceDirectory>true</includeTestSourceDirectory>
-            <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
   <!--
       Maven Site Configuration
 
diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml
index 512cd1266..6484e91a9 100644
--- a/mappingservice/pom.xml
+++ b/mappingservice/pom.xml
@@ -78,6 +78,19 @@
   </dependencies>
 
   <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <!-- Enforce odlparent checkstyle -->
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-checkstyle-plugin</artifactId>
+          <configuration>
+            <includeTestSourceDirectory>true</includeTestSourceDirectory>
+            <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>
diff --git a/mappingservice/shell/pom.xml b/mappingservice/shell/pom.xml
index d78a76b88..49e1a0540 100644
--- a/mappingservice/shell/pom.xml
+++ b/mappingservice/shell/pom.xml
@@ -25,19 +25,6 @@
   </dependencies>
 
   <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <!-- Enforce odlparent checkstyle -->
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-checkstyle-plugin</artifactId>
-          <configuration>
-            <includeTestSourceDirectory>true</includeTestSourceDirectory>
-            <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>
diff --git a/mappingservice/southbound/pom.xml b/mappingservice/southbound/pom.xml
index c5a0ee671..58e092379 100644
--- a/mappingservice/southbound/pom.xml
+++ b/mappingservice/southbound/pom.xml
@@ -57,22 +57,6 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <!-- Enforce odlparent checkstyle -->
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-checkstyle-plugin</artifactId>
-          <configuration>
-            <includeTestSourceDirectory>true</includeTestSourceDirectory>
-            <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
   <!--
       Maven Site Configuration