X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=vpnmanager%2Fapi%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetvirt%2Fvpnmanager%2Fapi%2Fintervpnlink%2FInterVpnLinkDataComposite.java;h=3ec633f6b6d2b9976a5c43afee804962d6fd1632;hb=HEAD;hp=0a1138f5f4aa89d206269be038a05e7b1835a074;hpb=09e87c1f400b1f41e1efa1a53d1fdcbfc8ac63a8;p=netvirt.git

diff --git a/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/InterVpnLinkDataComposite.java b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/InterVpnLinkDataComposite.java
index 0a1138f5f4..3ec633f6b6 100755
--- a/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/InterVpnLinkDataComposite.java
+++ b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/InterVpnLinkDataComposite.java
@@ -10,13 +10,15 @@ package org.opendaylight.netvirt.vpnmanager.api.intervpnlink;
 
 import static java.util.Collections.emptyList;
 
-import com.google.common.base.Optional;
 import java.math.BigInteger;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netvirt.inter.vpn.link.rev160311.inter.vpn.link.states.InterVpnLinkState;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netvirt.inter.vpn.link.rev160311.inter.vpn.links.InterVpnLink;
+import org.opendaylight.yangtools.yang.common.Uint32;
+import org.opendaylight.yangtools.yang.common.Uint64;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -67,8 +69,8 @@ public class InterVpnLinkDataComposite {
     }
 
     public Optional<InterVpnLinkState.State> getState() {
-        return this.interVpnLinkState == null ? Optional.absent()
-                                              : Optional.fromNullable(this.interVpnLinkState.getState());
+        return this.interVpnLinkState == null ? Optional.empty()
+                                              : Optional.ofNullable(this.interVpnLinkState.getState());
     }
 
     public boolean isActive() {
@@ -76,7 +78,8 @@ public class InterVpnLinkDataComposite {
     }
 
     public boolean stepsOnDpn(BigInteger dpnId) {
-        return getFirstEndpointDpns().contains(dpnId) || getSecondEndpointDpns().contains(dpnId);
+        return getFirstEndpointDpns().contains(Uint64.valueOf(dpnId))
+                    || getSecondEndpointDpns().contains(Uint64.valueOf(dpnId));
     }
 
     public boolean isBgpRoutesLeaking() {
@@ -116,10 +119,10 @@ public class InterVpnLinkDataComposite {
     }
 
     public boolean isIpAddrTheOtherVpnEndpoint(String ipAddr, String vpnUuid) {
-        return (vpnUuid.equals(getFirstEndpointVpnUuid().orNull())
-                    && ipAddr.equals(getSecondEndpointIpAddr().orNull()))
-               || (vpnUuid.equals(getSecondEndpointVpnUuid().orNull())
-                     && ipAddr.equals(getFirstEndpointIpAddr().orNull()));
+        return (vpnUuid.equals(getFirstEndpointVpnUuid().orElse(null))
+                    && ipAddr.equals(getSecondEndpointIpAddr().orElse(null)))
+               || (vpnUuid.equals(getSecondEndpointVpnUuid().orElse(null))
+                     && ipAddr.equals(getFirstEndpointIpAddr().orElse(null)));
     }
 
     @Nullable
@@ -129,25 +132,25 @@ public class InterVpnLinkDataComposite {
 
     public Optional<String> getFirstEndpointVpnUuid() {
         if (this.interVpnLinkCfg == null) {
-            return Optional.absent();
+            return Optional.empty();
         }
         return Optional.of(this.interVpnLinkCfg.getFirstEndpoint().getVpnUuid().getValue());
     }
 
     public Optional<String> getFirstEndpointIpAddr() {
         if (this.interVpnLinkCfg == null) {
-            return Optional.absent();
+            return Optional.empty();
         }
         return Optional.of(this.interVpnLinkCfg.getFirstEndpoint().getIpAddress().getValue());
     }
 
-    public Optional<Long> getFirstEndpointLportTag() {
+    public Optional<Uint32> getFirstEndpointLportTag() {
         return (!isComplete() || this.interVpnLinkState.getFirstEndpointState().getLportTag() == null)
-                   ? Optional.absent()
+                   ? Optional.empty()
                    : Optional.of(this.interVpnLinkState.getFirstEndpointState().getLportTag());
     }
 
-    public List<BigInteger> getFirstEndpointDpns() {
+    public List<Uint64> getFirstEndpointDpns() {
         return (!isComplete() || this.interVpnLinkState.getFirstEndpointState().getDpId() == null)
                    ? emptyList()
                    : this.interVpnLinkState.getFirstEndpointState().getDpId();
@@ -155,25 +158,25 @@ public class InterVpnLinkDataComposite {
 
     public Optional<String> getSecondEndpointVpnUuid() {
         if (!isComplete()) {
-            return Optional.absent();
+            return Optional.empty();
         }
         return Optional.of(this.interVpnLinkCfg.getSecondEndpoint().getVpnUuid().getValue());
     }
 
     public Optional<String> getSecondEndpointIpAddr() {
         if (!isComplete()) {
-            return Optional.absent();
+            return Optional.empty();
         }
         return Optional.of(this.interVpnLinkCfg.getSecondEndpoint().getIpAddress().getValue());
     }
 
-    public Optional<Long> getSecondEndpointLportTag() {
+    public Optional<Uint32> getSecondEndpointLportTag() {
         return (!isComplete() || this.interVpnLinkState.getSecondEndpointState().getLportTag() == null)
-            ? Optional.absent()
+            ? Optional.empty()
             : Optional.of(this.interVpnLinkState.getSecondEndpointState().getLportTag());
     }
 
-    public List<BigInteger> getSecondEndpointDpns() {
+    public List<Uint64> getSecondEndpointDpns() {
         return (!isComplete() || this.interVpnLinkState.getSecondEndpointState().getDpId() == null)
                     ? emptyList()
                     : this.interVpnLinkState.getSecondEndpointState().getDpId();
@@ -186,8 +189,8 @@ public class InterVpnLinkDataComposite {
                       endpointIpAddr, getInterVpnLinkName());
             return null;
         }
-        return isFirstEndpointIpAddr(endpointIpAddr) ? getFirstEndpointVpnUuid().orNull()
-                                                     : getSecondEndpointVpnUuid().orNull();
+        return isFirstEndpointIpAddr(endpointIpAddr) ? getFirstEndpointVpnUuid().orElse(null)
+                                                     : getSecondEndpointVpnUuid().orElse(null);
     }
 
     @Nullable
@@ -197,8 +200,8 @@ public class InterVpnLinkDataComposite {
             return null;
         }
 
-        return isFirstEndpointVpnName(vpnUuid) ? getSecondEndpointIpAddr().orNull()
-                                               : getFirstEndpointIpAddr().orNull();
+        return isFirstEndpointVpnName(vpnUuid) ? getSecondEndpointIpAddr().orElse(null)
+                                               : getFirstEndpointIpAddr().orElse(null);
     }
 
     @Nullable
@@ -208,32 +211,32 @@ public class InterVpnLinkDataComposite {
                       endpointIpAddr, getInterVpnLinkName());
             return null;
         }
-        return isFirstEndpointIpAddr(endpointIpAddr) ? getSecondEndpointVpnUuid().orNull()
-                                                     : getFirstEndpointVpnUuid().orNull();
+        return isFirstEndpointIpAddr(endpointIpAddr) ? getSecondEndpointVpnUuid().orElse(null)
+                                                     : getFirstEndpointVpnUuid().orElse(null);
     }
 
-    public Optional<Long> getEndpointLportTagByVpnName(String vpnName) {
+    public Optional<Uint32> getEndpointLportTagByVpnName(String vpnName) {
         if (!isComplete()) {
-            return Optional.absent();
+            return Optional.empty();
         }
 
         return isFirstEndpointVpnName(vpnName) ? Optional.of(interVpnLinkState.getFirstEndpointState().getLportTag())
                                                : Optional.of(interVpnLinkState.getSecondEndpointState().getLportTag());
     }
 
-    public Optional<Long> getEndpointLportTagByIpAddr(String endpointIp) {
+    public Optional<Uint32> getEndpointLportTagByIpAddr(String endpointIp) {
         if (!isComplete()) {
-            return Optional.absent();
+            return Optional.empty();
         }
 
         return isFirstEndpointIpAddr(endpointIp)
-                    ? Optional.fromNullable(interVpnLinkState.getFirstEndpointState().getLportTag())
-                    : Optional.fromNullable(interVpnLinkState.getSecondEndpointState().getLportTag());
+                    ? Optional.ofNullable(interVpnLinkState.getFirstEndpointState().getLportTag())
+                    : Optional.ofNullable(interVpnLinkState.getSecondEndpointState().getLportTag());
     }
 
-    public Optional<Long> getOtherEndpointLportTagByVpnName(String vpnName) {
+    public Optional<Uint32> getOtherEndpointLportTagByVpnName(String vpnName) {
         if (!isComplete()) {
-            return Optional.absent();
+            return Optional.empty();
         }
 
         return isFirstEndpointVpnName(vpnName) ? Optional.of(interVpnLinkState.getSecondEndpointState().getLportTag())
@@ -247,8 +250,8 @@ public class InterVpnLinkDataComposite {
             return null;
         }
 
-        return isFirstEndpointVpnName(vpnName) ? getSecondEndpointVpnUuid().orNull()
-                                               : getFirstEndpointVpnUuid().orNull();
+        return isFirstEndpointVpnName(vpnName) ? getSecondEndpointVpnUuid().orElse(null)
+                                               : getFirstEndpointVpnUuid().orElse(null);
     }
 
     @Nullable
@@ -258,8 +261,8 @@ public class InterVpnLinkDataComposite {
             return null;
         }
 
-        return isFirstEndpointVpnName(vpnUuid) ? getSecondEndpointIpAddr().orNull()
-                                               : getFirstEndpointIpAddr().orNull();
+        return isFirstEndpointVpnName(vpnUuid) ? getSecondEndpointIpAddr().orElse(null)
+                                               : getFirstEndpointIpAddr().orElse(null);
     }
 
     @Nullable
@@ -269,47 +272,47 @@ public class InterVpnLinkDataComposite {
             return null;
         }
 
-        return isFirstEndpointVpnName(vpnUuid) ? getFirstEndpointIpAddr().orNull()
-                                               : getSecondEndpointIpAddr().orNull();
+        return isFirstEndpointVpnName(vpnUuid) ? getFirstEndpointIpAddr().orElse(null)
+                                               : getSecondEndpointIpAddr().orElse(null);
     }
 
-    public List<BigInteger> getEndpointDpnsByVpnName(String vpnUuid) {
+    public List<Uint64> getEndpointDpnsByVpnName(String vpnUuid) {
         if (!isComplete()) {
             return emptyList();
         }
 
-        List<BigInteger> dpns = isFirstEndpointVpnName(vpnUuid) ? interVpnLinkState.getFirstEndpointState().getDpId()
+        List<Uint64> dpns = isFirstEndpointVpnName(vpnUuid) ? interVpnLinkState.getFirstEndpointState().getDpId()
                                                                 : interVpnLinkState.getSecondEndpointState().getDpId();
         return dpns == null ? emptyList() : dpns;
     }
 
-    public List<BigInteger> getOtherEndpointDpnsByVpnName(String vpnUuid) {
+    public List<Uint64> getOtherEndpointDpnsByVpnName(String vpnUuid) {
         if (!isComplete()) {
             return emptyList();
         }
 
-        List<BigInteger> dpns = isFirstEndpointVpnName(vpnUuid) ? interVpnLinkState.getSecondEndpointState().getDpId()
+        List<Uint64> dpns = isFirstEndpointVpnName(vpnUuid) ? interVpnLinkState.getSecondEndpointState().getDpId()
                                                                 : interVpnLinkState.getFirstEndpointState().getDpId();
         return dpns == null ? emptyList() : dpns;
     }
 
-    public List<BigInteger> getEndpointDpnsByIpAddr(String endpointIp) {
+    public List<Uint64> getEndpointDpnsByIpAddr(String endpointIp) {
         if (!isComplete()) {
             return emptyList();
         }
 
-        List<BigInteger> dpns =
+        List<Uint64> dpns =
             isFirstEndpointIpAddr(endpointIp) ? this.interVpnLinkState.getFirstEndpointState().getDpId()
                                               : this.interVpnLinkState.getSecondEndpointState().getDpId();
         return dpns == null ? emptyList() : dpns;
     }
 
-    public List<BigInteger> getOtherEndpointDpnsByIpAddr(String endpointIp) {
+    public List<Uint64> getOtherEndpointDpnsByIpAddr(String endpointIp) {
         if (!isComplete()) {
             return emptyList();
         }
 
-        List<BigInteger> dpns =
+        List<Uint64> dpns =
             isFirstEndpointIpAddr(endpointIp) ? this.interVpnLinkState.getSecondEndpointState().getDpId()
                                               : this.interVpnLinkState.getFirstEndpointState().getDpId();
         return dpns == null ? emptyList() : dpns;
@@ -318,10 +321,10 @@ public class InterVpnLinkDataComposite {
     @Override
     public String toString() {
         final String ns = "Not specified";
-        return "InterVpnLink " + getInterVpnLinkName() + " 1stEndpoint=[vpn=" + getFirstEndpointVpnUuid().or(ns)
-            + " ipAddr=" + getFirstEndpointIpAddr().or(ns) + " dpn=" + getFirstEndpointDpns() + "]  2ndEndpoint=[vpn="
-            + getSecondEndpointVpnUuid().or(ns) + " ipAddr=" + getSecondEndpointIpAddr().or(ns) + " dpn="
-            + getSecondEndpointDpns() + "]";
+        return "InterVpnLink " + getInterVpnLinkName() + " 1stEndpoint=[vpn=" + getFirstEndpointVpnUuid().orElse(ns)
+            + " ipAddr=" + getFirstEndpointIpAddr().orElse(ns) + " dpn=" + getFirstEndpointDpns() + "]  "
+            + "2ndEndpoint=[vpn=" + getSecondEndpointVpnUuid().orElse(ns) + " ipAddr="
+            + getSecondEndpointIpAddr().orElse(ns) + " dpn=" + getSecondEndpointDpns() + "]";
     }
 
     @Override
@@ -338,8 +341,8 @@ public class InterVpnLinkDataComposite {
         InterVpnLinkDataComposite other = (InterVpnLinkDataComposite) obj;
         String none = "";
         return getInterVpnLinkName().equals(other.getInterVpnLinkName())
-            && getFirstEndpointVpnUuid().or(none).equals(other.getFirstEndpointVpnUuid().or(none))
-            && getFirstEndpointIpAddr().or(none).equals(other.getFirstEndpointIpAddr().or(none));
+            && getFirstEndpointVpnUuid().orElse(none).equals(other.getFirstEndpointVpnUuid().orElse(none))
+            && getFirstEndpointIpAddr().orElse(none).equals(other.getFirstEndpointIpAddr().orElse(none));
     }
 
     @Override