Make VpnUtil.isDualRouterVpnUpdate() static

This method does not touch any state, make it static and update
its sole caller.

Change-Id: I52211fc3f3636ffe0d3cfac2ce024f39364b614e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java
index 4c3c4bfb9cb57fe86da92c33ae31c0d26defea99..62b2180aff323232918b48173ac7b2c16f069894 100755 (executable)
--- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java
+++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java
@@ -1621,7 +1621,7 @@ public class VpnInterfaceManager extends AsyncDataTreeChangeListenerBase<VpnInte
              *
              */
             isVpnInstanceUpdate = Boolean.TRUE;
-            if (vpnUtil.isDualRouterVpnUpdate(oldVpnListCopy, newVpnListCopy)) {
+            if (VpnUtil.isDualRouterVpnUpdate(oldVpnListCopy, newVpnListCopy)) {
                 if ((oldVpnListCopy.size() == 2 || oldVpnListCopy.size() == 3)
                         && (oldVpnList.size() == 1 && newVpnList.size() == 0)) {
                     //Identify the external BGP-VPN Instance and pass that value as newVpnList

diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java
index 35081e1eef7462a285faf6b4a3080bfaf1b76684..989a466a4ab723bd01bbe176169b6b28cd6c84f2 100644 (file)
--- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java
+++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java
@@ -2333,11 +2333,8 @@ public final class VpnUtil {
         return obj != null ? obj : requireNonNull(defaultObj);
     }
 
-    public boolean isDualRouterVpnUpdate(List<String> oldVpnListCopy, List<String> newVpnListCopy) {
-        if (oldVpnListCopy.size() == 2 && newVpnListCopy.size() == 3
-                || oldVpnListCopy.size() == 3 && newVpnListCopy.size() == 2) {
-            return true;
-        }
-        return false;
+    public static boolean isDualRouterVpnUpdate(List<String> oldVpnListCopy, List<String> newVpnListCopy) {
+        return oldVpnListCopy.size() == 2 && newVpnListCopy.size() == 3
+                || oldVpnListCopy.size() == 3 && newVpnListCopy.size() == 2;
     }
 }