From 86e6b52736294c63c964561c2bb6ec5ac04ba26d Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 19 Nov 2018 13:38:48 +0100
Subject: [PATCH] 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>
---
 .../netvirt/vpnmanager/VpnInterfaceManager.java          | 2 +-
 .../org/opendaylight/netvirt/vpnmanager/VpnUtil.java     | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

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 4c3c4bfb9c..62b2180aff 100755
--- 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 35081e1eef..989a466a4a 100644
--- 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;
     }
 }
-- 
2.36.6