Merge "Bug 6097: Add xTR-ID and Site-ID to Map-Notify"

diff --git a/mappingservice/dsbackend/pom.xml b/mappingservice/dsbackend/pom.xml
index 34789a5aa9e4fdb8845dbeb8b044cc0a69082617..af94f6b6ed02b953a5e847c7d7e045c62f590626 100644 (file)
--- a/mappingservice/dsbackend/pom.xml
+++ b/mappingservice/dsbackend/pom.xml
@@ -18,7 +18,7 @@
 
   <artifactId>mappingservice.dsbackend</artifactId>
   <packaging>bundle</packaging>
-  <name>Mapping Service datastore backend</name>
+  <name>Mapping Service DataStore BackEnd</name>
 
   <dependencies>
     <dependency>
@@ -50,31 +50,13 @@
     <pluginManagement>
       <plugins>
         <plugin>
-          <!-- Temporarily override the odlparent checkstyle configuration.
-               We want to enforce some simple rules and add more as we clean up code -->
+          <!-- Enforce odlparent checkstyle -->
+          <groupId>org.apache.maven.plugins</groupId>
           <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>
+            <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
           </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>

diff --git a/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEnd.java b/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEnd.java
index 9d2d2a351f4255eb568d0c64269c15c16c30ff16..a499b71b1fe488fb068d65a5c9cf30dc131d104e 100644 (file)
--- a/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEnd.java
+++ b/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEnd.java
@@ -7,9 +7,13 @@
  */
 package org.opendaylight.lispflowmapping.dsbackend;
 
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+import com.google.common.util.concurrent.CheckedFuture;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.opendaylight.controller.md.sal.binding.api.BindingTransactionChain;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
@@ -31,12 +35,6 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
-import com.google.common.util.concurrent.CheckedFuture;
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-
 /**
  * Stores data coming from the mapping database RPCs into the MD-SAL datastore.
  *
@@ -228,8 +226,8 @@ public class DataStoreBackEnd implements TransactionChainListener {
             public void onSuccess(Void result) {
             }
 
-            public void onFailure(Throwable t) {
-                LOG.error("Transaction failed:", t);
+            public void onFailure(Throwable throwable) {
+                LOG.error("Transaction failed:", throwable);
             }
         });
     }
@@ -262,8 +260,8 @@ public class DataStoreBackEnd implements TransactionChainListener {
             public void onSuccess(Void result) {
             }
 
-            public void onFailure(Throwable t) {
-                LOG.error("Transaction failed:", t);
+            public void onFailure(Throwable throwable) {
+                LOG.error("Transaction failed:", throwable);
             }
         });
     }

diff --git a/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/InstanceIdentifierUtil.java b/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/InstanceIdentifierUtil.java
index 9192d682a0e9e3126e606016018742959577e798..30a781efee80ad0682bcd697540c77de335c9558 100644 (file)
--- a/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/InstanceIdentifierUtil.java
+++ b/mappingservice/dsbackend/src/main/java/org/opendaylight/lispflowmapping/dsbackend/InstanceIdentifierUtil.java
@@ -7,15 +7,16 @@
  */
 package org.opendaylight.lispflowmapping.dsbackend;
 
+import com.google.common.base.Preconditions;
 import org.opendaylight.lispflowmapping.lisp.util.LispAddressStringifier;
 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.InstanceId;
 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.mappingservice.rev150906.EidUri;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.VniUri;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.MappingDatabase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.MappingOrigin;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.VniUri;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.XtrIdUri;
 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.AuthenticationKeyKey;
@@ -27,8 +28,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev15090
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.mapping.database.VirtualNetworkIdentifierKey;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
-import com.google.common.base.Preconditions;
-
 /**
  * Utility class to create InstanceIdentifier path objects based on EID.
  * Used for storing RPC data to the config datastore.

diff --git a/mappingservice/dsbackend/src/test/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEndTest.java b/mappingservice/dsbackend/src/test/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEndTest.java
index a7aefb2cb3fb674cea4434056921db3a59d450cb..1eda0a2e963e198a4bfcc4997ce19b20beac7cf5 100644 (file)
--- a/mappingservice/dsbackend/src/test/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEndTest.java
+++ b/mappingservice/dsbackend/src/test/java/org/opendaylight/lispflowmapping/dsbackend/DataStoreBackEndTest.java
@@ -89,19 +89,19 @@ public class DataStoreBackEndTest {
 
     @Before
     public void init() {
-        DataBroker brokerMock = Mockito.mock(DataBroker.class);
-        Logger logMock = Mockito.mock(Logger.class, "LOG");
+        final DataBroker brokerMock = Mockito.mock(DataBroker.class);
+        final Logger logMock = Mockito.mock(Logger.class, "LOG");
 
         PowerMockito.mockStatic(LoggerFactory.class);
-        PowerMockito.when(LoggerFactory.getLogger(DataStoreBackEnd.class)).
-                thenReturn(logMock);
+        PowerMockito.when(LoggerFactory.getLogger(DataStoreBackEnd.class))
+                .thenReturn(logMock);
         Mockito.when(logMock.isDebugEnabled()).thenReturn(true);
         Mockito.when(brokerMock.createTransactionChain(Mockito.any(DataStoreBackEnd.class))).thenReturn(txChainMock);
         dataStoreBackEnd = PowerMockito.spy(new DataStoreBackEnd(brokerMock));
 
         Mockito.when(txChainMock.newWriteOnlyTransaction()).thenReturn(wTxMock);
-        Mockito.when(wTxMock.submit()).
-                thenReturn(Futures.<Void, TransactionCommitFailedException>immediateCheckedFuture(null));
+        Mockito.when(wTxMock.submit())
+                .thenReturn(Futures.<Void, TransactionCommitFailedException>immediateCheckedFuture(null));
     }
 
     /**

diff --git a/mappingservice/mapcache/pom.xml b/mappingservice/mapcache/pom.xml
index 6e51050c5ec6cc6dea51b448b81f63b3fd3009cd..2d17d7b9921be364c8ffbe55c86747c5ae4d449f 100644 (file)
--- a/mappingservice/mapcache/pom.xml
+++ b/mappingservice/mapcache/pom.xml
@@ -37,31 +37,13 @@
     <pluginManagement>
       <plugins>
         <plugin>
-          <!-- Temporarily override the odlparent checkstyle configuration.
-               We want to enforce some simple rules and add more as we clean up code -->
+          <!-- Enforce odlparent checkstyle -->
+          <groupId>org.apache.maven.plugins</groupId>
           <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>
+            <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
           </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>

diff --git a/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/FlatMapCache.java b/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/FlatMapCache.java
index fae68548002cdb3ae531b077f79a980deb11b776..210cfa8768ac30797a2b3cb1dae14cddac5a2083 100644 (file)
--- a/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/FlatMapCache.java
+++ b/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/FlatMapCache.java
@@ -9,7 +9,6 @@
 package org.opendaylight.lispflowmapping.mapcache;
 
 import java.util.Date;
-
 import org.opendaylight.lispflowmapping.interfaces.dao.ILispDAO;
 import org.opendaylight.lispflowmapping.interfaces.dao.IRowVisitor;
 import org.opendaylight.lispflowmapping.interfaces.dao.MappingEntry;

diff --git a/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/MappingMergeUtil.java b/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/MappingMergeUtil.java
index c4098e95da0a4dee8557b1edc2e674aeec997d45..f3cdeba0029c3a0ddd865e69654b5189d02b2efa 100644 (file)
--- a/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/MappingMergeUtil.java
+++ b/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/MappingMergeUtil.java
@@ -7,13 +7,13 @@
  */
 package org.opendaylight.lispflowmapping.mapcache;
 
+import com.google.common.base.Preconditions;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.IpAddressBinary;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.XtrId;
@@ -24,10 +24,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
  *
@@ -67,10 +65,10 @@ public final class MappingMergeUtil {
         return newLocator;
     }
 
-    private static int compareLocators(LocatorRecord a, LocatorRecord b) {
-        byte[] aIp = LispAddressUtil.ipAddressToByteArray(a.getRloc().getAddress());
-        byte[] bIp = LispAddressUtil.ipAddressToByteArray(b.getRloc().getAddress());
-        return LispAddressUtil.compareIpAddressByteArrays(aIp, bIp);
+    private static int compareLocators(LocatorRecord one, LocatorRecord two) {
+        byte[] oneIp = LispAddressUtil.ipAddressToByteArray(one.getRloc().getAddress());
+        byte[] twoIp = LispAddressUtil.ipAddressToByteArray(two.getRloc().getAddress());
+        return LispAddressUtil.compareIpAddressByteArrays(oneIp, twoIp);
     }
 
     private static void mergeLocatorRecords(MappingRecordBuilder mrb, MappingRecord newRecord) {
@@ -107,29 +105,30 @@ public final class MappingMergeUtil {
         if (newLocatorList.size() != 0) {
             List<LocatorRecord> mergedLocators = new ArrayList<LocatorRecord>();
 
-            int mlIt = 0, lIt = 0;
-            while (mlIt < newLocatorList.size() && lIt < locators.size()) {
-                int cmp = compareLocators(locators.get(lIt), newLocatorList.get(mlIt));
+            int mlocIt = 0;
+            int locIt = 0;
+            while (mlocIt < newLocatorList.size() && locIt < locators.size()) {
+                int cmp = compareLocators(locators.get(locIt), newLocatorList.get(mlocIt));
                 if (cmp < 0) {
-                    mergedLocators.add(locators.get(lIt));
-                    lIt++;
+                    mergedLocators.add(locators.get(locIt));
+                    locIt++;
                 } else if (cmp > 0) {
-                    mergedLocators.add(newLocatorList.get(mlIt));
-                    mlIt++;
+                    mergedLocators.add(newLocatorList.get(mlocIt));
+                    mlocIt++;
                 } else {
                     // when a locator appears in both lists, keep the new (merged) one and skip the old
-                    mergedLocators.add(newLocatorList.get(mlIt));
-                    mlIt++;
-                    lIt++;
+                    mergedLocators.add(newLocatorList.get(mlocIt));
+                    mlocIt++;
+                    locIt++;
                 }
             }
-            while (lIt < locators.size()) {
-                mergedLocators.add(locators.get(lIt));
-                lIt++;
+            while (locIt < locators.size()) {
+                mergedLocators.add(locators.get(locIt));
+                locIt++;
             }
-            while (mlIt < newLocatorList.size()) {
-                mergedLocators.add(newLocatorList.get(mlIt));
-                mlIt++;
+            while (mlocIt < newLocatorList.size()) {
+                mergedLocators.add(newLocatorList.get(mlocIt));
+                mlocIt++;
             }
             mrb.setLocatorRecord(mergedLocators);
         }

diff --git a/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/MultiTableMapCache.java b/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/MultiTableMapCache.java
index d5081d96d5122a19487287066443c4d81ecb94cc..5aa2808187898c445a62831a97203c1ae55d70dc 100644 (file)
--- a/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/MultiTableMapCache.java
+++ b/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/MultiTableMapCache.java
@@ -10,7 +10,6 @@ package org.opendaylight.lispflowmapping.mapcache;
 
 import java.util.Date;
 import java.util.Map;
-
 import org.opendaylight.lispflowmapping.interfaces.dao.ILispDAO;
 import org.opendaylight.lispflowmapping.interfaces.dao.IRowVisitor;
 import org.opendaylight.lispflowmapping.interfaces.dao.MappingEntry;
@@ -116,7 +115,7 @@ public class MultiTableMapCache implements IMapCache {
             ILispDAO srcDstDao = (ILispDAO) daoEntry.get(SubKeys.LCAF_SRCDST);
             if (srcDstDao != null) {
                 Object mapping = getMappingLpmEid(srcEid, srcDstDao);
-                if (mapping!= null) {
+                if (mapping !=  null) {
                     return mapping;
                 }
             }

diff --git a/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/SimpleMapCache.java b/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/SimpleMapCache.java
index 1726705599e4d70663f15b31bdc87074389fa815..66ff495f07bdf23f61f9267c3b564f500e0682ff 100644 (file)
--- a/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/SimpleMapCache.java
+++ b/mappingservice/mapcache/src/main/java/org/opendaylight/lispflowmapping/mapcache/SimpleMapCache.java
@@ -15,7 +15,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import org.opendaylight.lispflowmapping.interfaces.dao.ILispDAO;
 import org.opendaylight.lispflowmapping.interfaces.dao.IRowVisitor;
 import org.opendaylight.lispflowmapping.interfaces.dao.MappingEntry;
@@ -26,8 +25,8 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.addres
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.IpAddressBinary;
 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.record.container.MappingRecord;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.authkey.container.MappingAuthkey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecord;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -195,8 +194,8 @@ public class SimpleMapCache implements IMapCache {
                 ILispDAO xtrIdTable = getXtrIdTable(eid, (ILispDAO) daoEntry.getValue().get(SubKeys.XTRID_RECORDS));
                 if (xtrIdTable != null) {
                     MappingRecord xtrIdRecord = (MappingRecord) xtrIdTable.getSpecific(xtrId, SubKeys.RECORD);
-                    if (xtrIdRecord.getTimestamp() != null &&
-                            MappingMergeUtil.timestampIsExpired(xtrIdRecord.getTimestamp())) {
+                    if (xtrIdRecord.getTimestamp() != null
+                            && MappingMergeUtil.timestampIsExpired(xtrIdRecord.getTimestamp())) {
                         xtrIdTable.removeSpecific(xtrId, SubKeys.RECORD);
                         return null;
                     } else {

diff --git a/mappingservice/mapcache/src/test/java/org/opendaylight/lispflowmapping/mapcache/FlatMapCacheTest.java b/mappingservice/mapcache/src/test/java/org/opendaylight/lispflowmapping/mapcache/FlatMapCacheTest.java
index 09db274e79b6b11dfcd8381fc08e22c3c103ab7d..d14c4101cdb5c68f46babe599018e46199101087 100644 (file)
--- a/mappingservice/mapcache/src/test/java/org/opendaylight/lispflowmapping/mapcache/FlatMapCacheTest.java
+++ b/mappingservice/mapcache/src/test/java/org/opendaylight/lispflowmapping/mapcache/FlatMapCacheTest.java
@@ -9,15 +9,14 @@ package org.opendaylight.lispflowmapping.mapcache;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyString;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.atMost;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.util.Date;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.lispflowmapping.interfaces.dao.ILispDAO;
@@ -25,14 +24,11 @@ import org.opendaylight.lispflowmapping.interfaces.dao.MappingEntry;
 import org.opendaylight.lispflowmapping.interfaces.dao.SubKeys;
 import org.opendaylight.lispflowmapping.lisp.util.MaskUtil;
 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.lisp.address.address
-        .Ipv4Builder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv4Builder;
 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.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.authkey.container.MappingAuthkey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.authkey.container.MappingAuthkeyBuilder;
 
 public class FlatMapCacheTest {
 

diff --git a/mappingservice/mapcache/src/test/java/org/opendaylight/lispflowmapping/mapcache/MappingMergeUtilTest.java b/mappingservice/mapcache/src/test/java/org/opendaylight/lispflowmapping/mapcache/MappingMergeUtilTest.java
index fd38955f4352e7afe52489a6336d2ded55d5ed99..5106c15f541d02b961bbafb58765f6a0b56eaf06 100644 (file)
--- a/mappingservice/mapcache/src/test/java/org/opendaylight/lispflowmapping/mapcache/MappingMergeUtilTest.java
+++ b/mappingservice/mapcache/src/test/java/org/opendaylight/lispflowmapping/mapcache/MappingMergeUtilTest.java
@@ -15,12 +15,10 @@ import static org.junit.Assert.assertTrue;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
-
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
@@ -32,8 +30,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 {
@@ -103,8 +100,8 @@ public class MappingMergeUtilTest {
                 .setRecordTtl(1)
                 .setSiteId(SITE_ID_2);
 
-        MappingRecord result = MappingMergeUtil.mergeMappings
-                (currentMergedMappingBuilder.build(), newMappingRecordBuilder.build(), null, null);
+        MappingRecord result = MappingMergeUtil.mergeMappings(
+                currentMergedMappingBuilder.build(), newMappingRecordBuilder.build(), null, null);
         assertEquals(mrb.build(),result);
     }
 
@@ -143,8 +140,8 @@ public class MappingMergeUtilTest {
                 .setSiteId(SITE_ID_2);
         mrb.getLocatorRecord().add(currentLocatorRecord_1);
 
-        MappingRecord result = MappingMergeUtil.mergeMappings
-                (currentMergedMappingBuilder.build(), newMappingRecordBuilder.build(), null, null);
+        MappingRecord result = MappingMergeUtil.mergeMappings(
+                currentMergedMappingBuilder.build(), newMappingRecordBuilder.build(), null, null);
         assertEquals(mrb.build(),result);
     }
 
@@ -184,8 +181,8 @@ public class MappingMergeUtilTest {
                 .setSiteId(SITE_ID_2).setTimestamp(timestamp);
         mrb.getLocatorRecord().add(newLocatorRecord_1);
 
-        MappingRecord result = MappingMergeUtil.mergeMappings
-                (currentMergedMappingBuilder.build(), newMappingRecordBuilder.build(), null, null);
+        MappingRecord result = MappingMergeUtil.mergeMappings(
+                currentMergedMappingBuilder.build(), newMappingRecordBuilder.build(), null, null);
         assertEquals(mrb.build(),result);
     }
 
@@ -223,8 +220,8 @@ public class MappingMergeUtilTest {
         mrb.getLocatorRecord().add(currentLocatorRecord_1);
         mrb.getLocatorRecord().add(newLocatorRecord_1);
 
-        MappingRecord result = MappingMergeUtil.mergeMappings
-                (currentMergedMappingBuilder.build(), newMappingRecordBuilder.build(), null, null);
+        MappingRecord result = MappingMergeUtil.mergeMappings(
+                currentMergedMappingBuilder.build(), newMappingRecordBuilder.build(), null, null);
         assertEquals(mrb.build(),result);
     }
 
@@ -276,8 +273,8 @@ public class MappingMergeUtilTest {
         mrb.getLocatorRecord().add(currentLocatorRecord_3);
         mrb.getLocatorRecord().add(newLocatorRecord_4);
 
-        MappingRecord result = MappingMergeUtil.mergeMappings
-                (currentMergedMappingBuilder.build(), newMappingRecordBuilder.build(), XTR_ID_3, timestamp);
+        MappingRecord result = MappingMergeUtil.mergeMappings(
+                currentMergedMappingBuilder.build(), newMappingRecordBuilder.build(), XTR_ID_3, timestamp);
         assertEquals(mrb.build(),result);
     }
 
@@ -341,8 +338,8 @@ public class MappingMergeUtilTest {
         mrb.getLocatorRecord().add(newLocatorRecord_3);
         mrb.getLocatorRecord().add(currentLocatorRecord_3);
 
-        MappingRecord result = MappingMergeUtil.mergeMappings
-                (currentMergedMappingBuilder.build(), newMappingRecordBuilder.build(), XTR_ID_3, timestamp);
+        MappingRecord result = MappingMergeUtil.mergeMappings(
+                currentMergedMappingBuilder.build(), newMappingRecordBuilder.build(), XTR_ID_3, timestamp);
         assertNotEquals(mrb.build(),result);
     }
 
@@ -372,8 +369,8 @@ public class MappingMergeUtilTest {
         newMappingRecordBuilder.getLocatorRecord().add(newLocatorRecord_1);
 
         // result
-        MappingRecord result = MappingMergeUtil.mergeMappings
-                (currentMergedMappingBuilder.build(), newMappingRecordBuilder.build(), XTR_ID_3, new Date(100L));
+        MappingRecord result = MappingMergeUtil.mergeMappings(
+                currentMergedMappingBuilder.build(), newMappingRecordBuilder.build(), XTR_ID_3, new Date(100L));
         assertEquals(XTR_ID_3, result.getXtrId());
         assertEquals((Long) 100L, result.getTimestamp());
     }
@@ -409,13 +406,13 @@ public class MappingMergeUtilTest {
      */
     @Test
     public void mergeXtrIdMappingsTest_verifyExpiredMappings() {
-        MappingRecord expiredMappingRecord_1 = getDefaultMappingRecordBuilder().setTimestamp(1L).build();
-        MappingRecord expiredMappingRecord_2 = getDefaultMappingRecordBuilder()
+        MappingRecord expiredMappingRecord1 = getDefaultMappingRecordBuilder().setTimestamp(1L).build();
+        MappingRecord expiredMappingRecord2 = getDefaultMappingRecordBuilder()
                 .setXtrId(XTR_ID_2)
                 .setTimestamp(1L).build();
         List<XtrId> expiredMappings = Lists.newArrayList();
         List<Object> mappingRecords =
-                Lists.newArrayList(expiredMappingRecord_1, expiredMappingRecord_2);
+                Lists.newArrayList(expiredMappingRecord1, expiredMappingRecord2);
 
         assertNull(MappingMergeUtil.mergeXtrIdMappings(mappingRecords, expiredMappings, null));
         assertEquals(2, expiredMappings.size());

diff --git a/mappingservice/mapcache/src/test/java/org/opendaylight/lispflowmapping/mapcache/MultiTableMapCacheTest.java b/mappingservice/mapcache/src/test/java/org/opendaylight/lispflowmapping/mapcache/MultiTableMapCacheTest.java
index 4e7b96b3c53fe3000305235161061749f12e1a6f..fbb4e272d1a3a681d32d39ae68b95427a9e60561 100644 (file)
--- a/mappingservice/mapcache/src/test/java/org/opendaylight/lispflowmapping/mapcache/MultiTableMapCacheTest.java
+++ b/mappingservice/mapcache/src/test/java/org/opendaylight/lispflowmapping/mapcache/MultiTableMapCacheTest.java
@@ -18,12 +18,10 @@ import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 import com.google.common.collect.Maps;
-
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Date;
 import java.util.Map;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
@@ -35,24 +33,18 @@ 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.Ipv4Address;
+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.lisp.address.types.rev151105.InstanceIdType;
 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.Ipv4Builder;
-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.inet.types.rev130715.Ipv4Prefix;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
-        .address.MacBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address
-        .address.SourceDestKeyBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.Ipv4Builder;
+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.MacBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.SourceDestKeyBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
 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.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.authkey.container.MappingAuthkey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.authkey.container.MappingAuthkeyBuilder;
 
 public class MultiTableMapCacheTest {
 

diff --git a/mappingservice/mapcache/src/test/java/org/opendaylight/lispflowmapping/mapcache/SimpleMapCacheTest.java b/mappingservice/mapcache/src/test/java/org/opendaylight/lispflowmapping/mapcache/SimpleMapCacheTest.java
index 051daff4e514d13d085c74889377529aade6b1e8..a2a5d1950c84fe820587c2c1176046af789d981f 100644 (file)
--- a/mappingservice/mapcache/src/test/java/org/opendaylight/lispflowmapping/mapcache/SimpleMapCacheTest.java
+++ b/mappingservice/mapcache/src/test/java/org/opendaylight/lispflowmapping/mapcache/SimpleMapCacheTest.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.util.AbstractMap.SimpleImmutableEntry;
 import java.util.Date;
 import java.util.Map;
-import java.util.AbstractMap.SimpleImmutableEntry;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -30,13 +28,10 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev16
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.inet.binary.types.rev160303.Ipv4AddressBinary;
 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.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.MappingRecordBuilder;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;