Migrate isFoo() callers

isFoo() is changing to getFoo(), remove use of deprecated methods.

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

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepGlobalRemoveCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepGlobalRemoveCommand.java
index 303c5360f39bfb18d3665bab24f88b3cdead39f4..99cbcfa98c985980b928d9a608c631e516d95abe 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepGlobalRemoveCommand.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepGlobalRemoveCommand.java
@@ -84,7 +84,7 @@ public class HwvtepGlobalRemoveCommand extends AbstractTransactionCommand {
             Map<ManagersKey, Managers> managers = hgAugmentation.getManagers();
             if (managers != null) {
                 for (Managers manager : managers.values()) {
-                    if (manager.isIsConnected()) {
+                    if (manager.getIsConnected()) {
                         connectedManager++;
                         if (connectedManager > ONE_CONNECTED_MANAGER) {
                             return false;

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeUpdateCommand.java
index 969bc761e5e400fa2b5d02240be9be5af1adbd48..f10883d8006bbadc27b751bba32d51a4a8daa803 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeUpdateCommand.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeUpdateCommand.java
@@ -110,8 +110,8 @@ public class BridgeUpdateCommand implements TransactCommand {
     }
 
     private static void setStpEnalbe(final Bridge bridge, final OvsdbBridgeAugmentation ovsdbManageNode) {
-        if (ovsdbManageNode.isStpEnable() != null) {
-            bridge.setStpEnable(ovsdbManageNode.isStpEnable());
+        if (ovsdbManageNode.getStpEnable() != null) {
+            bridge.setStpEnable(ovsdbManageNode.getStpEnable());
         }
     }
 

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/OvsdbUpgradeStateListener.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/OvsdbUpgradeStateListener.java
index 0ee27676313cd8f37cf3fe65a1fa63bf28b08b1a..cff0658d54a28581d0ccfd76614d0957b852540e 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/OvsdbUpgradeStateListener.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/OvsdbUpgradeStateListener.java
@@ -64,9 +64,9 @@ public class OvsdbUpgradeStateListener implements ClusteredDataTreeChangeListene
             if (change.getRootNode().getModificationType() == ModificationType.WRITE) {
                 UpgradeConfig before = change.getRootNode().getDataBefore();
                 UpgradeConfig after = change.getRootNode().getDataAfter();
-                if (before != null && before.isUpgradeInProgress() && after != null && !after.isUpgradeInProgress()) {
+                if (before != null && before.getUpgradeInProgress() && after != null && !after.getUpgradeInProgress()) {
                     LOG.info("Upgrade Flag is set from {} to {}, Trigger Reconciliation",
-                        before.isUpgradeInProgress(), after.isUpgradeInProgress());
+                        before.getUpgradeInProgress(), after.getUpgradeInProgress());
                     //TODO Trigger Reconciliation on all the ovsDbConnectionInstance
                     for (Map.Entry<ConnectionInfo, OvsdbConnectionInstance> entry : cm.getClients().entrySet()) {
                         ConnectionInfo connectionInfo = entry.getKey();

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbBridgeUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbBridgeUpdateCommand.java
index 99caee95ce766d44f08e1db967b86c8c99ed2b74..a909b7c1b3f208850bcc2b330e2ca1dfd7d92fc3 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbBridgeUpdateCommand.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbBridgeUpdateCommand.java
@@ -356,7 +356,7 @@ public class OvsdbBridgeUpdateCommand extends AbstractTransactionCommand {
         LOG.debug("setOpenFlowNodeRef: updatedControllerRows: {}", updatedControllerRows);
         for (ControllerEntry controllerEntry: SouthboundMapper.createControllerEntries(bridge, updatedControllerRows)) {
             if (controllerEntry != null
-                && controllerEntry.isIsConnected() != null && controllerEntry.isIsConnected()) {
+                && controllerEntry.getIsConnected() != null && controllerEntry.getIsConnected()) {
                 String [] controllerTarget = controllerEntry.getTarget().getValue().split(":");
                 IpAddress bridgeControllerIpAddress = null;
                 for (String targetElement : controllerTarget) {

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbNodeRemoveCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbNodeRemoveCommand.java
index 29ac0a059747d1e8d82ad489ac15daf667a64c5a..aa194b5f3c9d0817d197693401259421ef2c6ab5 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbNodeRemoveCommand.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbNodeRemoveCommand.java
@@ -82,7 +82,7 @@ public class OvsdbNodeRemoveCommand extends AbstractTransactionCommand {
             final Map<ManagerEntryKey, ManagerEntry> entries = ovsdbNodeAugmentation.getManagerEntry();
             if (entries != null) {
                 for (ManagerEntry manager : entries.values()) {
-                    if (manager.isConnected()) {
+                    if (manager.getConnected()) {
                         connectedManager++;
                         if (connectedManager > ONE_CONNECTED_MANAGER) {
                             return false;

diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbBridgeUpdateCommandTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbBridgeUpdateCommandTest.java
index d00400ba6ca4f049d183bfbea75e22798b444179..ceed84afc33a6c55cc89ba4b6d361d45b08146d9 100644 (file)
--- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbBridgeUpdateCommandTest.java
+++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbBridgeUpdateCommandTest.java
@@ -455,7 +455,7 @@ public class OvsdbBridgeUpdateCommandTest {
         controllerEntryList.add(controllerEntry);
         when(SouthboundMapper.createControllerEntries(any(Bridge.class), any(Map.class)))
                 .thenReturn(controllerEntryList);
-        when(controllerEntry.isIsConnected()).thenReturn(true);
+        when(controllerEntry.getIsConnected()).thenReturn(true);
         Uri uri = mock(Uri.class);
         when(controllerEntry.getTarget()).thenReturn(uri);
         when(uri.getValue()).thenReturn("tcp:192.168.12.56:6633");
@@ -476,7 +476,7 @@ public class OvsdbBridgeUpdateCommandTest {
                 .thenReturn(ovsdbBridgeAugmentationBuilder);
 
         Whitebox.invokeMethod(ovsdbBridgeUpdateCommand, "setOpenFlowNodeRef", ovsdbBridgeAugmentationBuilder, bridge);
-        verify(controllerEntry, times(2)).isIsConnected();
+        verify(controllerEntry, times(2)).getIsConnected();
         verify(ovsdbBridgeAugmentationBuilder).setBridgeOpenflowNodeRef(any(InstanceIdentifier.class));
     }
 }

diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbNodeRemoveCommandTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbNodeRemoveCommandTest.java
index 27dd3afe4e29facd3dda327da98ab4900beb39ee..c6b802e422f62271a5ad0eb46b1cac2e78fcc683 100644 (file)
--- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbNodeRemoveCommandTest.java
+++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbNodeRemoveCommandTest.java
@@ -106,8 +106,8 @@ public class OvsdbNodeRemoveCommandTest {
         doReturn(new ManagerEntryKey(new Uri("manager"))).when(manager).key();
         doReturn(new ManagerEntryKey(new Uri("manager1"))).when(manager1).key();
 
-        when(manager.isConnected()).thenReturn(true, false, true);
-        when(manager1.isConnected()).thenReturn(true, false, true);
+        when(manager.getConnected()).thenReturn(true, false, true);
+        when(manager1.getConnected()).thenReturn(true, false, true);
         when(manager.getNumberOfConnections()).thenReturn(Uint32.ZERO);
 
         Map<ManagerEntryKey, ManagerEntry> listManagerEntry = new HashMap<>();