Fix checkstyle

Updated checkstyle is finding these, fix them up.

Change-Id: I811ae8a5c11591a07bbab9bc50b162e9029072c0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit c588fd3263e23abc0696760838e4b328b435c6d5)

diff --git a/mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/dao/ILispDAO.java b/mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/dao/ILispDAO.java
index 203d6ab05b8a3787d391c2bef7e91c911fe4600e..fe32352b43c873e4dbdc8ffb70be30d0928a825a 100644 (file)
--- a/mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/dao/ILispDAO.java
+++ b/mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/dao/ILispDAO.java
@@ -5,12 +5,10 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.lispflowmapping.interfaces.dao;
 
 import java.util.AbstractMap.SimpleImmutableEntry;
 import java.util.Map;
 package org.opendaylight.lispflowmapping.interfaces.dao;
 
 import java.util.AbstractMap.SimpleImmutableEntry;
 import java.util.Map;

-

 import java.util.Set;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid;
 
 import java.util.Set;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid;
 

diff --git a/mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/lisp/IFlowMapping.java b/mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/lisp/IFlowMapping.java
index a015302fa992647fe79913f12da2514261d9ee25..6c9349907e361c7c828fac4d01bb507565a1d12e 100644 (file)
--- a/mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/lisp/IFlowMapping.java
+++ b/mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/lisp/IFlowMapping.java
@@ -8,7 +8,6 @@
 package org.opendaylight.lispflowmapping.interfaces.lisp;
 
 import java.util.List;
 package org.opendaylight.lispflowmapping.interfaces.lisp;
 
 import java.util.List;

-

 import org.apache.commons.lang3.tuple.Pair;
 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.apache.commons.lang3.tuple.Pair;
 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;

diff --git a/mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/lisp/IMapNotifyHandler.java b/mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/lisp/IMapNotifyHandler.java
index 441bb819fffe75c4389c0a42e3182907c2cc16a5..5ff69daaffd12d17c8c5f705f7f31c6663a13e6f 100644 (file)
--- a/mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/lisp/IMapNotifyHandler.java
+++ b/mappingservice/api/src/main/java/org/opendaylight/lispflowmapping/interfaces/lisp/IMapNotifyHandler.java
@@ -8,7 +8,6 @@
 package org.opendaylight.lispflowmapping.interfaces.lisp;
 
 import java.util.List;
 package org.opendaylight.lispflowmapping.interfaces.lisp;
 
 import java.util.List;

-

 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.MapRequest;
 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.MapNotify;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.MapRequest;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.Rloc;

diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/timebucket/containers/TimeBucket.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/timebucket/containers/TimeBucket.java
index ea25d880f650ca96e2d7b9a6d5f8f3dd138d78fc..7df789942ac1ad83f43091bc8d792e84b8d41c6d 100644 (file)
--- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/timebucket/containers/TimeBucket.java
+++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/timebucket/containers/TimeBucket.java
@@ -5,11 +5,9 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.lispflowmapping.implementation.timebucket.containers;
 
 import java.util.concurrent.ConcurrentHashMap;
 package org.opendaylight.lispflowmapping.implementation.timebucket.containers;
 
 import java.util.concurrent.ConcurrentHashMap;

-

 import org.opendaylight.lispflowmapping.implementation.MappingSystem;
 import org.opendaylight.lispflowmapping.lisp.type.MappingData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid;
 import org.opendaylight.lispflowmapping.implementation.MappingSystem;
 import org.opendaylight.lispflowmapping.lisp.type.MappingData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid;

diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/timebucket/containers/TimeBucketWheel.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/timebucket/containers/TimeBucketWheel.java
index 8cb174cb8bec28325e06881edc4f62c4fcdb272b..e8b591c118bc3ba81dbe5639e45c68c064125fbf 100644 (file)
--- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/timebucket/containers/TimeBucketWheel.java
+++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/timebucket/containers/TimeBucketWheel.java
@@ -5,12 +5,10 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.lispflowmapping.implementation.timebucket.containers;
 
 import java.util.ArrayList;
 import java.util.List;
 package org.opendaylight.lispflowmapping.implementation.timebucket.containers;
 
 import java.util.ArrayList;
 import java.util.List;

-

 import org.opendaylight.lispflowmapping.implementation.MappingSystem;
 import org.opendaylight.lispflowmapping.lisp.type.MappingData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid;
 import org.opendaylight.lispflowmapping.implementation.MappingSystem;
 import org.opendaylight.lispflowmapping.lisp.type.MappingData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid;

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 74199b2cd11c0a00c9e13b969f4120f24a36ce83..9776adb5d88e75d27dffbb2c916b30cb38071489 100644 (file)
--- 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
@@ -5,15 +5,12 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.lispflowmapping.implementation.util;
 
 import com.google.common.base.Preconditions;
 import edu.umd.cs.findbugs.annotations.Nullable;
 package org.opendaylight.lispflowmapping.implementation.util;
 
 import com.google.common.base.Preconditions;
 import edu.umd.cs.findbugs.annotations.Nullable;

-

 import java.util.Arrays;
 import java.util.List;
 import java.util.Arrays;
 import java.util.List;

-

 import org.opendaylight.lispflowmapping.lisp.type.MappingData;
 import org.opendaylight.lispflowmapping.lisp.util.LispAddressStringifier;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.SiteId;
 import org.opendaylight.lispflowmapping.lisp.type.MappingData;
 import org.opendaylight.lispflowmapping.lisp.util.LispAddressStringifier;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.SiteId;


@@ -35,7 +32,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev15090
  * DataStoreBackEnd utilities.
  *
  * @author Florin Coras
  * DataStoreBackEnd utilities.
  *
  * @author Florin Coras

- *

  */
 public final class DSBEInputUtil {
     // Utility class, should not be instantiated
  */
 public final class DSBEInputUtil {
     // Utility class, should not be instantiated

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/authentication/LispAuthenticationUtil.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/authentication/LispAuthenticationUtil.java
index e36425f35a02ac69da732ea8efd0af572d2b2164..b234ac5053ca8abd5e443b582a000d220cf73561 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/authentication/LispAuthenticationUtil.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/authentication/LispAuthenticationUtil.java
@@ -8,7 +8,6 @@
 package org.opendaylight.lispflowmapping.lisp.authentication;
 
 import java.nio.ByteBuffer;
 package org.opendaylight.lispflowmapping.lisp.authentication;
 
 import java.nio.ByteBuffer;

-

 import org.opendaylight.lispflowmapping.lisp.serializer.MapNotifySerializer;
 import org.opendaylight.lispflowmapping.lisp.util.LispAddressStringifier;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.MapNotify;
 import org.opendaylight.lispflowmapping.lisp.serializer.MapNotifySerializer;
 import org.opendaylight.lispflowmapping.lisp.util.LispAddressStringifier;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.MapNotify;

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/EidRecordSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/EidRecordSerializer.java
index fb57f3607a6c695e533ea22617bb1548934e1f5e..34590259bb9c8fbc28e5234dc6018d731f82e7ee 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/EidRecordSerializer.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/EidRecordSerializer.java
@@ -8,14 +8,12 @@
 package org.opendaylight.lispflowmapping.lisp.serializer;
 
 import java.nio.ByteBuffer;
 package org.opendaylight.lispflowmapping.lisp.serializer;
 
 import java.nio.ByteBuffer;

-

 import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializerContext;
 import org.opendaylight.lispflowmapping.lisp.util.ByteUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid;
 
 public final class EidRecordSerializer {
 import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializerContext;
 import org.opendaylight.lispflowmapping.lisp.util.ByteUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid;
 
 public final class EidRecordSerializer {

-

     private static final EidRecordSerializer INSTANCE = new EidRecordSerializer();
 
     // Private constructor prevents instantiation from other classes
     private static final EidRecordSerializer INSTANCE = new EidRecordSerializer();
 
     // Private constructor prevents instantiation from other classes

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/LocatorRecordSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/LocatorRecordSerializer.java
index 8d736d8e4dd6e867c754966fb3a2d6b1c613828f..65240864eac77a616c1797ec749ce85d76658a15 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/LocatorRecordSerializer.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/LocatorRecordSerializer.java
@@ -10,7 +10,6 @@ package org.opendaylight.lispflowmapping.lisp.serializer;
 import static org.opendaylight.yangtools.yang.common.UintConversions.fromJava;
 
 import java.nio.ByteBuffer;
 import static org.opendaylight.yangtools.yang.common.UintConversions.fromJava;
 
 import java.nio.ByteBuffer;

-

 import org.apache.commons.lang3.BooleanUtils;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializer;
 import org.opendaylight.lispflowmapping.lisp.util.ByteUtil;
 import org.apache.commons.lang3.BooleanUtils;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializer;
 import org.opendaylight.lispflowmapping.lisp.util.ByteUtil;


@@ -21,7 +20,6 @@ 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.rloc.container.Rloc;
 
 public final class LocatorRecordSerializer {
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.Rloc;
 
 public final class LocatorRecordSerializer {

-

     private static final LocatorRecordSerializer INSTANCE = new LocatorRecordSerializer();
 
     // Private constructor prevents instantiation from other classes
     private static final LocatorRecordSerializer INSTANCE = new LocatorRecordSerializer();
 
     // Private constructor prevents instantiation from other classes

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/MapReplySerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/MapReplySerializer.java
index d6bd8da92ab65d0480a1cd63dc3c7968a2c01060..de90b60852fb685128606b42c8384fe8f6f79e24 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/MapReplySerializer.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/MapReplySerializer.java
@@ -9,7 +9,6 @@ package org.opendaylight.lispflowmapping.lisp.serializer;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;

-

 import org.apache.commons.lang3.BooleanUtils;
 import org.opendaylight.lispflowmapping.lisp.serializer.exception.LispSerializationException;
 import org.opendaylight.lispflowmapping.lisp.util.ByteUtil;
 import org.apache.commons.lang3.BooleanUtils;
 import org.opendaylight.lispflowmapping.lisp.serializer.exception.LispSerializationException;
 import org.opendaylight.lispflowmapping.lisp.util.ByteUtil;

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/MappingRecordSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/MappingRecordSerializer.java
index d498d7ca99f4138d68ee91bcd0baf7d93618ddeb..78f3817bf120f06ed4ac64f406c8f408bc779951 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/MappingRecordSerializer.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/MappingRecordSerializer.java
@@ -9,7 +9,6 @@ package org.opendaylight.lispflowmapping.lisp.serializer;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;

-

 import org.apache.commons.lang3.BooleanUtils;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializerContext;
 import org.apache.commons.lang3.BooleanUtils;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializerContext;


@@ -22,7 +21,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.ma
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecordBuilder;
 
 public final class MappingRecordSerializer {
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecordBuilder;
 
 public final class MappingRecordSerializer {

-

     private static final MappingRecordSerializer INSTANCE = new MappingRecordSerializer();
 
     // Private constructor prevents instantiation from other classes
     private static final MappingRecordSerializer INSTANCE = new MappingRecordSerializer();
 
     // Private constructor prevents instantiation from other classes

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/AfiListSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/AfiListSerializer.java
index c281110b3978add790c2802b03d27e9c52c388fe..c47a6edbdbc685c67947ffa766082c8436664b65 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/AfiListSerializer.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/AfiListSerializer.java
@@ -10,7 +10,6 @@ package org.opendaylight.lispflowmapping.lisp.serializer.address;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;

-

 import org.opendaylight.lispflowmapping.lisp.type.LispCanonicalAddressFormatEnum;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana.afn.safi.rev130704.AddressFamily;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.AfiListLcaf;
 import org.opendaylight.lispflowmapping.lisp.type.LispCanonicalAddressFormatEnum;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana.afn.safi.rev130704.AddressFamily;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.AfiListLcaf;


@@ -25,7 +24,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.rloc.container.RlocBuilder;
 
 public final class AfiListSerializer extends LcafSerializer {
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.RlocBuilder;
 
 public final class AfiListSerializer extends LcafSerializer {

-

     private static final AfiListSerializer INSTANCE = new AfiListSerializer();
 
     // Private constructor prevents instantiation from other classes
     private static final AfiListSerializer INSTANCE = new AfiListSerializer();
 
     // Private constructor prevents instantiation from other classes

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/ApplicationDataSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/ApplicationDataSerializer.java
index da276104c270f5a688d235ce46f9841ff47ef830..d13285ba1f89cd6084e86865fab440a5662c8522 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/ApplicationDataSerializer.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/ApplicationDataSerializer.java
@@ -10,7 +10,6 @@ package org.opendaylight.lispflowmapping.lisp.serializer.address;
 import static org.opendaylight.yangtools.yang.common.UintConversions.fromJava;
 
 import java.nio.ByteBuffer;
 import static org.opendaylight.yangtools.yang.common.UintConversions.fromJava;
 
 import java.nio.ByteBuffer;

-

 import org.opendaylight.lispflowmapping.lisp.type.LispCanonicalAddressFormatEnum;
 import org.opendaylight.lispflowmapping.lisp.util.ByteUtil;
 import org.opendaylight.lispflowmapping.lisp.util.NumberUtil;
 import org.opendaylight.lispflowmapping.lisp.type.LispCanonicalAddressFormatEnum;
 import org.opendaylight.lispflowmapping.lisp.util.ByteUtil;
 import org.opendaylight.lispflowmapping.lisp.util.NumberUtil;


@@ -28,7 +27,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.rloc.container.RlocBuilder;
 
 public final class ApplicationDataSerializer extends LcafSerializer {
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.RlocBuilder;
 
 public final class ApplicationDataSerializer extends LcafSerializer {

-

     private static final ApplicationDataSerializer INSTANCE = new ApplicationDataSerializer();
 
     // Private constructor prevents instantiation from other classes
     private static final ApplicationDataSerializer INSTANCE = new ApplicationDataSerializer();
 
     // Private constructor prevents instantiation from other classes

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/DistinguishedNameSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/DistinguishedNameSerializer.java
index 69d58986a124183bec73ba43fcb8a623364a7d3e..7c3cd04b7d2b8687d606f7f1641feba98fba47fb 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/DistinguishedNameSerializer.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/DistinguishedNameSerializer.java
@@ -8,7 +8,6 @@
 package org.opendaylight.lispflowmapping.lisp.serializer.address;
 
 import java.nio.ByteBuffer;
 package org.opendaylight.lispflowmapping.lisp.serializer.address;
 
 import java.nio.ByteBuffer;

-

 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana.afn.safi.rev130704.AddressFamily;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.DistinguishedNameAfi;
 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.iana.afn.safi.rev130704.AddressFamily;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.DistinguishedNameAfi;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.DistinguishedNameType;


@@ -22,7 +21,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.rloc.container.RlocBuilder;
 
 public final class DistinguishedNameSerializer extends LispAddressSerializer {
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.RlocBuilder;
 
 public final class DistinguishedNameSerializer extends LispAddressSerializer {

-

     private static final DistinguishedNameSerializer INSTANCE = new DistinguishedNameSerializer();
 
     // Private constructor prevents instantiation from other classes
     private static final DistinguishedNameSerializer INSTANCE = new DistinguishedNameSerializer();
 
     // Private constructor prevents instantiation from other classes

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/ExplicitLocatorPathSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/ExplicitLocatorPathSerializer.java
index 145c612416769ca0ac64dd287da57bff5879ef4a..6084270d4b9434fcc897b0146e647e11e2bc5392 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/ExplicitLocatorPathSerializer.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/ExplicitLocatorPathSerializer.java
@@ -10,7 +10,6 @@ package org.opendaylight.lispflowmapping.lisp.serializer.address;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;

-

 import org.apache.commons.lang3.BooleanUtils;
 import org.opendaylight.lispflowmapping.lisp.type.LispCanonicalAddressFormatEnum;
 import org.opendaylight.lispflowmapping.lisp.util.ByteUtil;
 import org.apache.commons.lang3.BooleanUtils;
 import org.opendaylight.lispflowmapping.lisp.type.LispCanonicalAddressFormatEnum;
 import org.opendaylight.lispflowmapping.lisp.util.ByteUtil;


@@ -30,7 +29,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.rloc.container.RlocBuilder;
 
 public final class ExplicitLocatorPathSerializer extends LcafSerializer {
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.RlocBuilder;
 
 public final class ExplicitLocatorPathSerializer extends LcafSerializer {

-

     private static final ExplicitLocatorPathSerializer INSTANCE = new ExplicitLocatorPathSerializer();
 
     // Private constructor prevents instantiation from other classes
     private static final ExplicitLocatorPathSerializer INSTANCE = new ExplicitLocatorPathSerializer();
 
     // Private constructor prevents instantiation from other classes

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/InstanceIdSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/InstanceIdSerializer.java
index b4edf9b85fc21cc1797a3961a91fcecf089a297f..97da7b117563d594e7dacf07cf8e597989285939 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/InstanceIdSerializer.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/InstanceIdSerializer.java
@@ -8,7 +8,6 @@
 package org.opendaylight.lispflowmapping.lisp.serializer.address;
 
 import java.nio.ByteBuffer;
 package org.opendaylight.lispflowmapping.lisp.serializer.address;
 
 import java.nio.ByteBuffer;

-

 import org.opendaylight.lispflowmapping.lisp.serializer.exception.LispSerializationException;
 import org.opendaylight.lispflowmapping.lisp.type.LispCanonicalAddressFormatEnum;
 import org.opendaylight.lispflowmapping.lisp.util.ByteUtil;
 import org.opendaylight.lispflowmapping.lisp.serializer.exception.LispSerializationException;
 import org.opendaylight.lispflowmapping.lisp.type.LispCanonicalAddressFormatEnum;
 import org.opendaylight.lispflowmapping.lisp.util.ByteUtil;


@@ -19,7 +18,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.addres
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid;
 
 public final class InstanceIdSerializer extends LcafSerializer {
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid;
 
 public final class InstanceIdSerializer extends LcafSerializer {

-

     private static final int MAX_INSTANCE_ID = 16777216;
     private static final InstanceIdSerializer INSTANCE = new InstanceIdSerializer();
 
     private static final int MAX_INSTANCE_ID = 16777216;
     private static final InstanceIdSerializer INSTANCE = new InstanceIdSerializer();
 

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4BinarySerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4BinarySerializer.java
index fbd48b935eaf08bb3b58071b46be5fde66b15fdb..e76c91527fc7ba8ed672f78daaa569d3667db88d 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4BinarySerializer.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4BinarySerializer.java
@@ -10,7 +10,6 @@ package org.opendaylight.lispflowmapping.lisp.serializer.address;
 import java.net.Inet4Address;
 import java.net.UnknownHostException;
 import java.nio.ByteBuffer;
 import java.net.Inet4Address;
 import java.net.UnknownHostException;
 import java.nio.ByteBuffer;

-

 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana.afn.safi.rev130704.AddressFamily;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
 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.iana.afn.safi.rev130704.AddressFamily;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;


@@ -32,7 +31,6 @@ import org.slf4j.LoggerFactory;
  * Class to (de)serialize IPv4 addresses from/to byte[] representation.
  *
  * @author Lorand Jakab
  * Class to (de)serialize IPv4 addresses from/to byte[] representation.
  *
  * @author Lorand Jakab

- *

  */
 public final class Ipv4BinarySerializer extends LispAddressSerializer {
 
  */
 public final class Ipv4BinarySerializer extends LispAddressSerializer {
 

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4PrefixBinarySerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4PrefixBinarySerializer.java
index ad76bb41e0271b92b91e802a1894a121bdf575bc..10cdfe3a68ffacfcfd09977d0ba92a9a2bcf492c 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4PrefixBinarySerializer.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4PrefixBinarySerializer.java
@@ -8,11 +8,9 @@
 package org.opendaylight.lispflowmapping.lisp.serializer.address;
 
 import com.google.common.net.InetAddresses;
 package org.opendaylight.lispflowmapping.lisp.serializer.address;
 
 import com.google.common.net.InetAddresses;

-

 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.nio.ByteBuffer;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.nio.ByteBuffer;

-

 import org.opendaylight.lispflowmapping.lisp.serializer.address.Ipv4Serializer.Length;
 import org.opendaylight.lispflowmapping.lisp.serializer.exception.LispSerializationException;
 import org.opendaylight.lispflowmapping.lisp.util.MaskUtil;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.Ipv4Serializer.Length;
 import org.opendaylight.lispflowmapping.lisp.serializer.exception.LispSerializationException;
 import org.opendaylight.lispflowmapping.lisp.util.MaskUtil;


@@ -35,7 +33,6 @@ import org.slf4j.LoggerFactory;
  * Class to (de)serialize IPv4 prefixes from/to byte[] representation.
  *
  * @author Lorand Jakab
  * Class to (de)serialize IPv4 prefixes from/to byte[] representation.
  *
  * @author Lorand Jakab

- *

  */
 public final class Ipv4PrefixBinarySerializer extends LispAddressSerializer {
 
  */
 public final class Ipv4PrefixBinarySerializer extends LispAddressSerializer {
 

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4PrefixSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4PrefixSerializer.java
index b151afdc8798f03faa4169064be67da94fae9cac..7c9a9e64a7d608e2424a458fdc4c704bbcfcec33 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4PrefixSerializer.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4PrefixSerializer.java
@@ -11,7 +11,6 @@ import com.google.common.net.InetAddresses;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.nio.ByteBuffer;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.nio.ByteBuffer;

-

 import org.opendaylight.lispflowmapping.lisp.serializer.address.Ipv4Serializer.Length;
 import org.opendaylight.lispflowmapping.lisp.serializer.exception.LispSerializationException;
 import org.opendaylight.lispflowmapping.lisp.util.MaskUtil;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.Ipv4Serializer.Length;
 import org.opendaylight.lispflowmapping.lisp.serializer.exception.LispSerializationException;
 import org.opendaylight.lispflowmapping.lisp.util.MaskUtil;


@@ -32,7 +31,6 @@ import org.slf4j.LoggerFactory;
  * Class to (de)serialize IPv4 prefixes from/to String representation.
  *
  * @author Lorand Jakab
  * Class to (de)serialize IPv4 prefixes from/to String representation.
  *
  * @author Lorand Jakab

- *

  */
 public final class Ipv4PrefixSerializer extends LispAddressSerializer {
 
  */
 public final class Ipv4PrefixSerializer extends LispAddressSerializer {
 

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4Serializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4Serializer.java
index 5d10530f38a89cb88d3d6ec33e92e96ba09432bf..b60a1b2f3ec949dfb913d786b78212eebefef48f 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4Serializer.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv4Serializer.java
@@ -10,7 +10,6 @@ package org.opendaylight.lispflowmapping.lisp.serializer.address;
 import java.net.Inet4Address;
 import java.net.UnknownHostException;
 import java.nio.ByteBuffer;
 import java.net.Inet4Address;
 import java.net.UnknownHostException;
 import java.nio.ByteBuffer;

-

 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana.afn.safi.rev130704.AddressFamily;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
 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.iana.afn.safi.rev130704.AddressFamily;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;


@@ -31,7 +30,6 @@ import org.slf4j.LoggerFactory;
  * Class to (de)serialize IPv4 addresses from/to String representation.
  *
  * @author Lorand Jakab
  * Class to (de)serialize IPv4 addresses from/to String representation.
  *
  * @author Lorand Jakab

- *

  */
 public final class Ipv4Serializer extends LispAddressSerializer {
 
  */
 public final class Ipv4Serializer extends LispAddressSerializer {
 

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6BinarySerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6BinarySerializer.java
index af9b5210db485b9337fae6b00c0eb19269bab363..11650e60fcf03fc813dbdf5fb0b33a0a2aca4a15 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6BinarySerializer.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6BinarySerializer.java
@@ -8,11 +8,9 @@
 package org.opendaylight.lispflowmapping.lisp.serializer.address;
 
 import com.google.common.net.InetAddresses;
 package org.opendaylight.lispflowmapping.lisp.serializer.address;
 
 import com.google.common.net.InetAddresses;

-

 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.nio.ByteBuffer;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.nio.ByteBuffer;

-

 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana.afn.safi.rev130704.AddressFamily;
 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.Ipv6Address;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana.afn.safi.rev130704.AddressFamily;
 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.Ipv6Address;


@@ -33,7 +31,6 @@ import org.slf4j.LoggerFactory;
  * Class to (de)serialize IPv6 addresses from/to byte[] representation.
  *
  * @author Lorand Jakab
  * Class to (de)serialize IPv6 addresses from/to byte[] representation.
  *
  * @author Lorand Jakab

- *

  */
 public final class Ipv6BinarySerializer extends LispAddressSerializer {
 
  */
 public final class Ipv6BinarySerializer extends LispAddressSerializer {
 

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6PrefixSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6PrefixSerializer.java
index 27a023b4a75e3f2878e7a8fa8d0b100be54c79b5..22fd3ba8477c67e8c99ea188e3a86157d2e9fbbd 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6PrefixSerializer.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6PrefixSerializer.java
@@ -11,7 +11,6 @@ import com.google.common.net.InetAddresses;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.nio.ByteBuffer;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.nio.ByteBuffer;

-

 import org.opendaylight.lispflowmapping.lisp.serializer.address.Ipv6Serializer.Length;
 import org.opendaylight.lispflowmapping.lisp.serializer.exception.LispSerializationException;
 import org.opendaylight.lispflowmapping.lisp.util.MaskUtil;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.Ipv6Serializer.Length;
 import org.opendaylight.lispflowmapping.lisp.serializer.exception.LispSerializationException;
 import org.opendaylight.lispflowmapping.lisp.util.MaskUtil;


@@ -32,7 +31,6 @@ import org.slf4j.LoggerFactory;
  * Class to (de)serialize IPv6 prefixes from/to String representation.
  *
  * @author Lorand Jakab
  * Class to (de)serialize IPv6 prefixes from/to String representation.
  *
  * @author Lorand Jakab

- *

  */
 public final class Ipv6PrefixSerializer extends LispAddressSerializer {
 
  */
 public final class Ipv6PrefixSerializer extends LispAddressSerializer {
 

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6Serializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6Serializer.java
index 0363583c254de34ac967de15905ce6743b2d9140..77b3bd1ae29bc455ba12a86d73a373dbf013bf10 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6Serializer.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/Ipv6Serializer.java
@@ -11,7 +11,6 @@ import com.google.common.net.InetAddresses;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.nio.ByteBuffer;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.nio.ByteBuffer;

-

 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana.afn.safi.rev130704.AddressFamily;
 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.Ipv6Address;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana.afn.safi.rev130704.AddressFamily;
 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.Ipv6Address;


@@ -31,7 +30,6 @@ import org.slf4j.LoggerFactory;
  * Class to (de)serialize IPv6 addresses from/to String representation.
  *
  * @author Lorand Jakab
  * Class to (de)serialize IPv6 addresses from/to String representation.
  *
  * @author Lorand Jakab

- *

  */
 public final class Ipv6Serializer extends LispAddressSerializer {
 
  */
 public final class Ipv6Serializer extends LispAddressSerializer {
 

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/KeyValueAddressSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/KeyValueAddressSerializer.java
index 1056ca7bd6f0d819b9b8d951849a7e5c5bae3d63..630049f82a44be4caa7bc0e9f3423026e747d750 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/KeyValueAddressSerializer.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/KeyValueAddressSerializer.java
@@ -8,7 +8,6 @@
 package org.opendaylight.lispflowmapping.lisp.serializer.address;
 
 import java.nio.ByteBuffer;
 package org.opendaylight.lispflowmapping.lisp.serializer.address;
 
 import java.nio.ByteBuffer;

-

 import org.opendaylight.lispflowmapping.lisp.type.LispCanonicalAddressFormatEnum;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana.afn.safi.rev130704.AddressFamily;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.KeyValueAddressLcaf;
 import org.opendaylight.lispflowmapping.lisp.type.LispCanonicalAddressFormatEnum;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana.afn.safi.rev130704.AddressFamily;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.KeyValueAddressLcaf;

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/LcafSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/LcafSerializer.java
index f3c8a3f63a227bfb5cea70b320e526b8ab5fbc20..773b71b2d5b3eec43fd28ff25f0b49643e3d2218 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/LcafSerializer.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/LcafSerializer.java
@@ -8,7 +8,6 @@
 package org.opendaylight.lispflowmapping.lisp.serializer.address;
 
 import java.nio.ByteBuffer;
 package org.opendaylight.lispflowmapping.lisp.serializer.address;
 
 import java.nio.ByteBuffer;

-

 import org.opendaylight.lispflowmapping.lisp.serializer.address.factory.LispAddressSerializerFactory;
 import org.opendaylight.lispflowmapping.lisp.serializer.exception.LispSerializationException;
 import org.opendaylight.lispflowmapping.lisp.util.AddressTypeMap;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.factory.LispAddressSerializerFactory;
 import org.opendaylight.lispflowmapping.lisp.serializer.exception.LispSerializationException;
 import org.opendaylight.lispflowmapping.lisp.util.AddressTypeMap;


@@ -21,7 +20,6 @@ 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.rloc.container.Rloc;
 
 public class LcafSerializer extends LispAddressSerializer {
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.Rloc;
 
 public class LcafSerializer extends LispAddressSerializer {

-

     private static final LcafSerializer INSTANCE = new LcafSerializer();
     private static final byte DEFAULT_IID_MASK_LENGTH = (byte) 32;
 
     private static final LcafSerializer INSTANCE = new LcafSerializer();
     private static final byte DEFAULT_IID_MASK_LENGTH = (byte) 32;
 

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/NoAddressSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/NoAddressSerializer.java
index 39be7940a3503eeaf0677a290fa3d45ef4cfb864..082652dfc0fea9b063e63f0628b07c0a1b06bc93 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/NoAddressSerializer.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/NoAddressSerializer.java
@@ -8,7 +8,6 @@
 package org.opendaylight.lispflowmapping.lisp.serializer.address;
 
 import java.nio.ByteBuffer;
 package org.opendaylight.lispflowmapping.lisp.serializer.address;
 
 import java.nio.ByteBuffer;

-

 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.LispAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.NoAddressAfi;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.NoAddressBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.LispAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.NoAddressAfi;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.lisp.address.address.NoAddressBuilder;


@@ -19,7 +18,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rl
 import org.opendaylight.yangtools.yang.common.Empty;
 
 public final class NoAddressSerializer extends LispAddressSerializer {
 import org.opendaylight.yangtools.yang.common.Empty;
 
 public final class NoAddressSerializer extends LispAddressSerializer {

-

     private static final NoAddressSerializer INSTANCE = new NoAddressSerializer();
 
     // Private constructor prevents instantiation from other classes
     private static final NoAddressSerializer INSTANCE = new NoAddressSerializer();
 
     // Private constructor prevents instantiation from other classes

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/SourceDestKeySerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/SourceDestKeySerializer.java
index 24f873fff259c674061e5b4cff68dd4b5ec5839a..68501690b3a4e71e03408130c68fd0bcfb7df1a4 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/SourceDestKeySerializer.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/SourceDestKeySerializer.java
@@ -8,7 +8,6 @@
 package org.opendaylight.lispflowmapping.lisp.serializer.address;
 
 import java.nio.ByteBuffer;
 package org.opendaylight.lispflowmapping.lisp.serializer.address;
 
 import java.nio.ByteBuffer;

-

 import org.opendaylight.lispflowmapping.lisp.type.LispCanonicalAddressFormatEnum;
 import org.opendaylight.lispflowmapping.lisp.util.ByteUtil;
 import org.opendaylight.lispflowmapping.lisp.util.MaskUtil;
 import org.opendaylight.lispflowmapping.lisp.type.LispCanonicalAddressFormatEnum;
 import org.opendaylight.lispflowmapping.lisp.util.ByteUtil;
 import org.opendaylight.lispflowmapping.lisp.util.MaskUtil;

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/AddressTypeMap.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/AddressTypeMap.java
index 17997bdcf575a816ea9bb823bc3fb247cbbaf135..d2fc7fe093a92c2566b83316c0d3b145332d083d 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/AddressTypeMap.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/AddressTypeMap.java
@@ -9,7 +9,6 @@ package org.opendaylight.lispflowmapping.lisp.util;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import java.util.HashMap;
 import java.util.Map;

-

 import org.opendaylight.lispflowmapping.lisp.type.LispCanonicalAddressFormatEnum;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana.afn.safi.rev130704.AddressFamily;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.AfiListLcaf;
 import org.opendaylight.lispflowmapping.lisp.type.LispCanonicalAddressFormatEnum;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana.afn.safi.rev130704.AddressFamily;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.AfiListLcaf;


@@ -39,7 +38,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.typ
  * This class contains static HashMaps of AFIs and LCAF types to LispAddressFamily identities.
  *
  * @author Lorand Jakab
  * This class contains static HashMaps of AFIs and LCAF types to LispAddressFamily identities.
  *
  * @author Lorand Jakab

- *

  */
 public final class AddressTypeMap {
     private static Map<Short, Class<? extends LispAddressFamily>> afiToAddressTypeMap;
  */
 public final class AddressTypeMap {
     private static Map<Short, Class<? extends LispAddressFamily>> afiToAddressTypeMap;

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MapNotifyBuilderHelper.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MapNotifyBuilderHelper.java
index 562f5b2877187200161b7154863fd83404338929..a671071910fd8b8eecc93614f96716a11329f126 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MapNotifyBuilderHelper.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MapNotifyBuilderHelper.java
@@ -10,7 +10,6 @@ package org.opendaylight.lispflowmapping.lisp.util;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

-

 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.mapnotifymessage.MapNotifyBuilder;
 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.MapRegister;
 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.list.MappingRecordItem;

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MapRequestUtil.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MapRequestUtil.java
index 304de4bed995d49dd0ac0929ee970c6784e072a9..c94c0e7e45ef5357586e699ec3097db4d4eb32e3 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MapRequestUtil.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MapRequestUtil.java
@@ -8,12 +8,10 @@
 package org.opendaylight.lispflowmapping.lisp.util;
 
 import com.google.common.net.InetAddresses;
 package org.opendaylight.lispflowmapping.lisp.util;
 
 import com.google.common.net.InetAddresses;

-

 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Random;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Random;

-

 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.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;
 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;

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MaskUtil.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MaskUtil.java
index b6cf1a9bf97c7058f5ea77d5079478f55bec64c4..351e7b42c2339221d07f417ac61e4f20c2a52c46 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MaskUtil.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/MaskUtil.java
@@ -9,13 +9,11 @@ package org.opendaylight.lispflowmapping.lisp.util;
 
 import com.google.common.base.Preconditions;
 import com.google.common.net.InetAddresses;
 
 import com.google.common.base.Preconditions;
 import com.google.common.net.InetAddresses;

-

 import java.net.Inet4Address;
 import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.nio.ByteBuffer;
 import java.net.Inet4Address;
 import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.nio.ByteBuffer;

-

 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
 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.lisp.address.types.rev151105.SimpleAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
 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.lisp.address.types.rev151105.SimpleAddress;

diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapNotifySerializationTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapNotifySerializationTest.java
index 1aeeb8999af0d0e68219a8ee574b7413f91a355c..1dfddbe196ae740e8ab1630e859bc7c9e8736961 100644 (file)
--- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapNotifySerializationTest.java
+++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapNotifySerializationTest.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.lispflowmapping.serializer;
 
 import static org.junit.Assert.assertEquals;
 package org.opendaylight.lispflowmapping.serializer;
 
 import static org.junit.Assert.assertEquals;


@@ -14,9 +13,7 @@ import static org.junit.Assert.assertTrue;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;

-

 import junitx.framework.ArrayAssert;
 import junitx.framework.ArrayAssert;

-

 import org.junit.Test;
 import org.opendaylight.lispflowmapping.lisp.serializer.MapNotifySerializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.exception.LispSerializationException;
 import org.junit.Test;
 import org.opendaylight.lispflowmapping.lisp.serializer.MapNotifySerializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.exception.LispSerializationException;

diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapRegisterSerializationTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapRegisterSerializationTest.java
index 0ccc7d5b3b7d645ec3e2fe5ade48bf3da77b1b55..aadbcc78204c5db435b99088dec102d47aade4b9 100644 (file)
--- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapRegisterSerializationTest.java
+++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapRegisterSerializationTest.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.lispflowmapping.serializer;
 
 import static org.junit.Assert.assertEquals;
 package org.opendaylight.lispflowmapping.serializer;
 
 import static org.junit.Assert.assertEquals;


@@ -14,9 +13,7 @@ import static org.junit.Assert.assertTrue;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;

-

 import junitx.framework.ArrayAssert;
 import junitx.framework.ArrayAssert;

-

 import org.junit.Test;
 import org.opendaylight.lispflowmapping.lisp.serializer.MapRegisterSerializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.MapRegisterSerializer.Length;
 import org.junit.Test;
 import org.opendaylight.lispflowmapping.lisp.serializer.MapRegisterSerializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.MapRegisterSerializer.Length;

diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapReplySerializationTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapReplySerializationTest.java
index d9181131e6954d0edea0f540d5b2a9ecbaed49ea..4049f14a2cdc9c1be2b1caa342b6636202c3274c 100644 (file)
--- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapReplySerializationTest.java
+++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapReplySerializationTest.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.lispflowmapping.serializer;
 
 import static org.junit.Assert.assertArrayEquals;
 package org.opendaylight.lispflowmapping.serializer;
 
 import static org.junit.Assert.assertArrayEquals;


@@ -13,9 +12,7 @@ import static org.junit.Assert.assertEquals;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;

-

 import junitx.framework.ArrayAssert;
 import junitx.framework.ArrayAssert;

-

 import org.junit.Ignore;
 import org.junit.Test;
 import org.opendaylight.lispflowmapping.lisp.serializer.MapReplySerializer;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.opendaylight.lispflowmapping.lisp.serializer.MapReplySerializer;

diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapRequestSerializationTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapRequestSerializationTest.java
index 92dcc24ed7473af29b7d13f66b9c32289c49a563..053e8cd052c9abd32bc96b2ab246daa6a020dd60 100644 (file)
--- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapRequestSerializationTest.java
+++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapRequestSerializationTest.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.lispflowmapping.serializer;
 
 import static org.junit.Assert.assertArrayEquals;
 package org.opendaylight.lispflowmapping.serializer;
 
 import static org.junit.Assert.assertArrayEquals;


@@ -15,7 +14,6 @@ import static org.junit.Assert.assertTrue;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;

-

 import org.junit.Test;
 import org.opendaylight.lispflowmapping.lisp.serializer.MapRequestSerializer;
 import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
 import org.junit.Test;
 import org.opendaylight.lispflowmapping.lisp.serializer.MapRequestSerializer;
 import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;

diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/DistinguishedNameSerializerTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/DistinguishedNameSerializerTest.java
index f2cedfdc8f8cffcfc9c25375e950fb3ae94c0ff1..ddc9b74fb3b5178f4eff543663c2a0c66422d07a 100644 (file)
--- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/DistinguishedNameSerializerTest.java
+++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/DistinguishedNameSerializerTest.java
@@ -10,9 +10,7 @@ package org.opendaylight.lispflowmapping.serializer.address;
 import static org.junit.Assert.assertEquals;
 
 import java.nio.ByteBuffer;
 import static org.junit.Assert.assertEquals;
 
 import java.nio.ByteBuffer;

-

 import junitx.framework.ArrayAssert;
 import junitx.framework.ArrayAssert;

-

 import org.junit.Test;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.exception.LispSerializationException;
 import org.junit.Test;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.exception.LispSerializationException;

diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/InstanceIdSerializerTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/InstanceIdSerializerTest.java
index 99df79d572f963bd85ae9961c57aed4bbbf64b17..e2888b1cebfd36b9a9ee64f2736623aaf2ec25bf 100644 (file)
--- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/InstanceIdSerializerTest.java
+++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/InstanceIdSerializerTest.java
@@ -11,9 +11,7 @@ import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 
 import java.nio.ByteBuffer;
 import static org.junit.Assert.assertEquals;
 
 import java.nio.ByteBuffer;

-

 import junitx.framework.ArrayAssert;
 import junitx.framework.ArrayAssert;

-

 import org.junit.Test;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializerContext;
 import org.junit.Test;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializerContext;

diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/ServicePathTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/ServicePathTest.java
index 36e2c6d85b80b7562b01ae569e014da57a017202..a24cbf2e6a7fdc10514183d9b84db110e67985a8 100644 (file)
--- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/ServicePathTest.java
+++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/ServicePathTest.java
@@ -10,9 +10,7 @@ package org.opendaylight.lispflowmapping.serializer.address;
 import static org.junit.Assert.assertEquals;
 
 import java.nio.ByteBuffer;
 import static org.junit.Assert.assertEquals;
 
 import java.nio.ByteBuffer;

-

 import junitx.framework.ArrayAssert;
 import junitx.framework.ArrayAssert;

-

 import org.junit.Test;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializerContext;
 import org.junit.Test;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializerContext;


@@ -27,7 +25,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.ei
  * Test class for Service Path Serializer.
  *
  * @author Lorand Jakab
  * Test class for Service Path Serializer.
  *
  * @author Lorand Jakab

- *

  */
 public class ServicePathTest extends BaseTestCase {
 
  */
 public class ServicePathTest extends BaseTestCase {
 

diff --git a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/PortDataProcessor.java b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/PortDataProcessor.java
index 378c62fdde9291584bd44a757e405277b0a955af..c240796c36a90d370eab0124712100f25b087767 100644 (file)
--- a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/PortDataProcessor.java
+++ b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/PortDataProcessor.java
@@ -8,7 +8,6 @@
 package org.opendaylight.lispflowmapping.neutron;
 
 import java.util.List;
 package org.opendaylight.lispflowmapping.neutron;
 
 import java.util.List;

-

 import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
 import org.opendaylight.lispflowmapping.neutron.mappingmanager.HostInformationManager;
 import org.opendaylight.lispflowmapping.neutron.mappingmanager.PortData;
 import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
 import org.opendaylight.lispflowmapping.neutron.mappingmanager.HostInformationManager;
 import org.opendaylight.lispflowmapping.neutron.mappingmanager.PortData;


@@ -28,9 +27,7 @@ import org.slf4j.LoggerFactory;
  * available this class shall be updated.
  *
  * @author Vina Ermagan
  * available this class shall be updated.
  *
  * @author Vina Ermagan

- *

  */
  */

-

 public class PortDataProcessor implements DataProcessor<Port> {
     private static final Logger LOG = LoggerFactory.getLogger(PortDataProcessor.class);
 
 public class PortDataProcessor implements DataProcessor<Port> {
     private static final Logger LOG = LoggerFactory.getLogger(PortDataProcessor.class);
 

diff --git a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/intenthandler/IntentHandlerAsyncExecutorProvider.java b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/intenthandler/IntentHandlerAsyncExecutorProvider.java
index f4da63f4c7751b26e4fc5981f898685bf2e2f9da..a507c0717118e9ff6b4ecc9920f76ecd5d76434d 100644 (file)
--- a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/intenthandler/IntentHandlerAsyncExecutorProvider.java
+++ b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/intenthandler/IntentHandlerAsyncExecutorProvider.java
@@ -9,7 +9,6 @@ package org.opendaylight.lispflowmapping.neutron.intenthandler;
 
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;

-

 import java.util.concurrent.Executors;
 
 /**
 import java.util.concurrent.Executors;
 
 /**

diff --git a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/HostInformationManager.java b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/HostInformationManager.java
index 62bfdf07245a1aa9c333aae5ec15aadb0105735d..8cad98c45ee5d5c9bd522271f30869baac8c6d0a 100644 (file)
--- a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/HostInformationManager.java
+++ b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/HostInformationManager.java
@@ -9,7 +9,6 @@ package org.opendaylight.lispflowmapping.neutron.mappingmanager;
 
 import java.util.Collection;
 import java.util.List;
 
 import java.util.Collection;
 import java.util.List;

-

 import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
 import org.opendaylight.lispflowmapping.neutron.LispUtil;
 import org.opendaylight.lispflowmapping.neutron.mappingmanager.mappers.HostIdToPortDataMapper;
 import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
 import org.opendaylight.lispflowmapping.neutron.LispUtil;
 import org.opendaylight.lispflowmapping.neutron.mappingmanager.mappers.HostIdToPortDataMapper;

diff --git a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/mappers/HostIdToPortDataMapper.java b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/mappers/HostIdToPortDataMapper.java
index af2bea05de65eb16991ab264dd8c2ad7db41f3ec..07bff99f7ec68f6cc7020a8051fc288880ec7949 100644 (file)
--- a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/mappers/HostIdToPortDataMapper.java
+++ b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/mappers/HostIdToPortDataMapper.java
@@ -8,7 +8,6 @@
 package org.opendaylight.lispflowmapping.neutron.mappingmanager.mappers;
 
 import java.util.concurrent.ConcurrentHashMap;
 package org.opendaylight.lispflowmapping.neutron.mappingmanager.mappers;
 
 import java.util.concurrent.ConcurrentHashMap;

-

 import org.opendaylight.lispflowmapping.neutron.mappingmanager.PortData;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.opendaylight.lispflowmapping.neutron.mappingmanager.PortData;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/mappers/HostIdToRlocMapper.java b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/mappers/HostIdToRlocMapper.java
index c8903389110e64142c06483d258f4bf67b25177d..7b424745863849c6f9eb16d04ac15895c246d12e 100644 (file)
--- a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/mappers/HostIdToRlocMapper.java
+++ b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/mappers/HostIdToRlocMapper.java
@@ -10,7 +10,6 @@ package org.opendaylight.lispflowmapping.neutron.mappingmanager.mappers;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;

-

 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.Rloc;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.rloc.container.Rloc;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/mappers/PortUuidToPortDataMapper.java b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/mappers/PortUuidToPortDataMapper.java
index 63a16bbabf343b6ae006134d87b2ef3e7de1085d..4d9d7221a55ca0d8925f79af5e6c4179a80647ce 100644 (file)
--- a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/mappers/PortUuidToPortDataMapper.java
+++ b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/mappers/PortUuidToPortDataMapper.java
@@ -9,7 +9,6 @@ package org.opendaylight.lispflowmapping.neutron.mappingmanager.mappers;
 
 import java.util.Collection;
 import java.util.HashMap;
 
 import java.util.Collection;
 import java.util.HashMap;

-

 import org.opendaylight.lispflowmapping.neutron.mappingmanager.PortData;
 
 /**
 import org.opendaylight.lispflowmapping.neutron.mappingmanager.PortData;
 
 /**

diff --git a/mappingservice/neutron/src/test/java/org/opendaylight/lispflowmapping/neutron/PortDataProcessorTest.java b/mappingservice/neutron/src/test/java/org/opendaylight/lispflowmapping/neutron/PortDataProcessorTest.java
index e44e216265c08fc635597f09038eb343f74640fc..9314974f6b6734ab452ed56d097c58d8ff2e1a00 100644 (file)
--- a/mappingservice/neutron/src/test/java/org/opendaylight/lispflowmapping/neutron/PortDataProcessorTest.java
+++ b/mappingservice/neutron/src/test/java/org/opendaylight/lispflowmapping/neutron/PortDataProcessorTest.java
@@ -8,7 +8,6 @@
 package org.opendaylight.lispflowmapping.neutron;
 
 import com.google.common.collect.Lists;
 package org.opendaylight.lispflowmapping.neutron;
 
 import com.google.common.collect.Lists;

-

 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

diff --git a/mappingservice/neutron/src/test/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/HostInformationManagerTest.java b/mappingservice/neutron/src/test/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/HostInformationManagerTest.java
index a46aa897ed7f55b187994d5bbdfb391d3620fb0c..43b0068da91c1b98a950268af3b67a92a994bed9 100644 (file)
--- a/mappingservice/neutron/src/test/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/HostInformationManagerTest.java
+++ b/mappingservice/neutron/src/test/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/HostInformationManagerTest.java
@@ -10,7 +10,6 @@ package org.opendaylight.lispflowmapping.neutron.mappingmanager;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;

-

 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;


@@ -30,7 +29,6 @@ import org.powermock.modules.junit4.PowerMockRunnerDelegate;
 /**
  * Created by Shakib Ahmed on 2/7/17.
  */
 /**
  * Created by Shakib Ahmed on 2/7/17.
  */

-

 @RunWith(PowerMockRunner.class)
 @PowerMockRunnerDelegate(MockitoJUnitRunner.class)
 @PrepareForTest(HostInformationManager.class)
 @RunWith(PowerMockRunner.class)
 @PowerMockRunnerDelegate(MockitoJUnitRunner.class)
 @PrepareForTest(HostInformationManager.class)

diff --git a/mappingservice/neutron/src/test/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/PortUuidToPortDataMapperTest.java b/mappingservice/neutron/src/test/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/PortUuidToPortDataMapperTest.java
index 21986269e22561e32525000c85d8c5ca1ea098e5..e8445283b3135284d83545c60806bd1821f3988a 100644 (file)
--- a/mappingservice/neutron/src/test/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/PortUuidToPortDataMapperTest.java
+++ b/mappingservice/neutron/src/test/java/org/opendaylight/lispflowmapping/neutron/mappingmanager/PortUuidToPortDataMapperTest.java
@@ -8,7 +8,6 @@
 package org.opendaylight.lispflowmapping.neutron.mappingmanager;
 
 import java.util.HashMap;
 package org.opendaylight.lispflowmapping.neutron.mappingmanager;
 
 import java.util.HashMap;

-

 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;


@@ -24,7 +23,6 @@ import org.powermock.reflect.Whitebox;
 /**
  * Created by Shakib Ahmed on 2/7/17.
  */
 /**
  * Created by Shakib Ahmed on 2/7/17.
  */

-

 @RunWith(PowerMockRunner.class)
 @PowerMockRunnerDelegate(MockitoJUnitRunner.class)
 @PrepareForTest(PortUuidToPortDataMapper.class)
 @RunWith(PowerMockRunner.class)
 @PowerMockRunnerDelegate(MockitoJUnitRunner.class)
 @PrepareForTest(PortUuidToPortDataMapper.class)

diff --git a/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundRPC.java b/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundRPC.java
index 71b987f8a6b8cf4ead02b94e45eac9fa02e009a6..a6da0553625b6fb0765adb2f456e2b306c3ec7e2 100644 (file)
--- a/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundRPC.java
+++ b/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundRPC.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.lispflowmapping.southbound;
 
 import com.google.common.util.concurrent.Futures;
 package org.opendaylight.lispflowmapping.southbound;
 
 import com.google.common.util.concurrent.Futures;


@@ -13,7 +12,6 @@ import com.google.common.util.concurrent.ListenableFuture;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;

-

 import org.opendaylight.lispflowmapping.lisp.serializer.MapNotifySerializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.MapRegisterSerializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.MapReplySerializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.MapNotifySerializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.MapRegisterSerializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.MapReplySerializer;


@@ -55,7 +53,6 @@ import org.slf4j.LoggerFactory;
  * @author Florin Coras (fcoras@cisco.com)
  * @author Lorand Jakab (lojakab@cisco.com)
  */
  * @author Florin Coras (fcoras@cisco.com)
  * @author Lorand Jakab (lojakab@cisco.com)
  */

-

 public class LispSouthboundRPC implements OdlLispSbService {
 
     protected static final Logger LOG = LoggerFactory.getLogger(LispSouthboundRPC.class);
 public class LispSouthboundRPC implements OdlLispSbService {
 
     protected static final Logger LOG = LoggerFactory.getLogger(LispSouthboundRPC.class);

diff --git a/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/util/LispNotificationHelper.java b/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/util/LispNotificationHelper.java
index fa1f172e1ca785cb5ebcb478775a0d03a9cf3d36..2d584317cfff8ef1a0ec2a2893c3b73219c110fb 100644 (file)
--- a/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/util/LispNotificationHelper.java
+++ b/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/util/LispNotificationHelper.java
@@ -8,7 +8,6 @@
 package org.opendaylight.lispflowmapping.southbound.util;
 
 import java.net.InetAddress;
 package org.opendaylight.lispflowmapping.southbound.util;
 
 import java.net.InetAddress;

-

 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.lisp.proto.rev151105.mapnotifynotification.MapNotify;
 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.lisp.proto.rev151105.mapnotifynotification.MapNotify;

diff --git a/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundRpcTest.java b/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundRpcTest.java
index bc0ffd22033aa32aef20238567c95371d1856780..74833d09cbde50bd630d5c2e771da3b5f9b19cf2 100644 (file)
--- a/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundRpcTest.java
+++ b/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundRpcTest.java
@@ -12,7 +12,6 @@ import static org.junit.Assert.assertEquals;
 import com.google.common.collect.Lists;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import com.google.common.collect.Lists;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;

-

 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;