Revert "Adapt to IetfInetUtil change"

This reverts commit 1025f0aa152c0d3ca1514dd21cf7af5d8312c9cd.

Change-Id: Ibed626270a9e2cf5121da57d30724383b38dc537
Signed-off-by: Faseela K <faseela.k@ericsson.com>

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 504646eaf8159088e6e1dd9354647fd00f239bc5..fbd48b935eaf08bb3b58071b46be5fde66b15fdb 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
@@ -110,7 +110,7 @@ public final class Ipv4BinarySerializer extends LispAddressSerializer {
     private static Ipv4Address deserializeDataNonBinary(ByteBuffer buffer) {
         byte[] ipBuffer = new byte[4];
         buffer.get(ipBuffer);
-        return new Ipv4Address(IetfInetUtil.INSTANCE.ipv4AddressFor(ipBuffer));
+        return IetfInetUtil.INSTANCE.ipv4AddressFor(ipBuffer);
     }
 
     protected interface Length {

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 88d76819c2105a655fecd8f80e2ef34f1d27fff8..5d10530f38a89cb88d3d6ec33e92e96ba09432bf 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
@@ -107,7 +107,7 @@ public final class Ipv4Serializer extends LispAddressSerializer {
     private static Ipv4Address deserializeData(ByteBuffer buffer) {
         byte[] ipBuffer = new byte[4];
         buffer.get(ipBuffer);
-        return new Ipv4Address(IetfInetUtil.INSTANCE.ipv4AddressFor(ipBuffer));
+        return IetfInetUtil.INSTANCE.ipv4AddressFor(ipBuffer);
     }
 
     protected interface Length {

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressUtil.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressUtil.java
index 5da1c43c7a3d133052177112aad10078fb3daf7d..c441972e0efbda5dd36d488f528d63dc59f3fc66 100644 (file)
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressUtil.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressUtil.java
@@ -145,11 +145,11 @@ public final class LispAddressUtil {
         if (address instanceof Inet4Address) {
             return (Address) new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types
                     .rev151105.lisp.address.address.Ipv4Builder()
-                    .setIpv4(new Ipv4Address(IetfInetUtil.INSTANCE.ipv4AddressFor(address))).build();
+                    .setIpv4(IetfInetUtil.INSTANCE.ipv4AddressFor(address)).build();
         } else if (address instanceof Inet6Address) {
             return (Address) new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types
                     .rev151105.lisp.address.address.Ipv6Builder()
-                    .setIpv6(new Ipv6Address(IetfInetUtil.INSTANCE.ipv6AddressFor(address))).build();
+                    .setIpv6(IetfInetUtil.INSTANCE.ipv6AddressFor(address)).build();
         }
         return null;
     }
@@ -899,13 +899,13 @@ public final class LispAddressUtil {
     }
 
     private static Ipv4 convertFromBinary(Ipv4Binary address) {
-        return new Ipv4Builder().setIpv4(new Ipv4Address(
-                IetfInetUtil.INSTANCE.ipv4AddressFor(address.getIpv4Binary().getValue()))).build();
+        return new Ipv4Builder().setIpv4(IetfInetUtil.INSTANCE.ipv4AddressFor(address.getIpv4Binary().getValue()))
+                .build();
     }
 
     private static Ipv6 convertFromBinary(Ipv6Binary address) {
-        return new Ipv6Builder().setIpv6(new Ipv6Address(
-                IetfInetUtil.INSTANCE.ipv6AddressFor(address.getIpv6Binary().getValue()))).build();
+        return new Ipv6Builder().setIpv6(IetfInetUtil.INSTANCE.ipv6AddressFor(address.getIpv6Binary().getValue()))
+                .build();
     }
 
     private static Pair<Class<? extends LispAddressFamily>, Address> convertFromBinary(Address addr) {