InfraUtil JobCordinator Changes. 60/89060/2
authorChetan Arakere Gowdru <chetan.arakere@altencalsoftlabs.com>
Tue, 14 Apr 2020 11:15:09 +0000 (16:45 +0530)
committerR P Karthika <r.p.karthika@ericsson.com>
Tue, 28 Apr 2020 11:43:16 +0000 (17:13 +0530)
Desc:
https://git.opendaylight.org/gerrit/c/infrautils/+/89057

Change-Id: I76744bf161cc6d1edadf013f2310f6aa6bb1efae
Signed-off-by: Chetan Arakere Gowdru <chetan.arakere@altencalsoftlabs.com>
Signed-off-by: R P Karthika <r.p.karthika@ericsson.com>
36 files changed:
idmanager/idmanager-impl/src/main/java/org/opendaylight/genius/idmanager/jobs/CleanUpJob.java
idmanager/idmanager-impl/src/main/java/org/opendaylight/genius/idmanager/jobs/IdHolderSyncJob.java
idmanager/idmanager-impl/src/main/java/org/opendaylight/genius/idmanager/jobs/LocalPoolCreateJob.java
idmanager/idmanager-impl/src/main/java/org/opendaylight/genius/idmanager/jobs/LocalPoolDeleteJob.java
idmanager/idmanager-impl/src/main/java/org/opendaylight/genius/idmanager/jobs/UpdateIdEntryJob.java
interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/InterfacemgrProvider.java
interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/listeners/InterfaceInventoryStateListener.java
interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/listeners/InterfaceTopologyStateListener.java
interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/listeners/TerminationPointStateListener.java
interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/ovs/confighelpers/OvsInterfaceConfigRemoveHelper.java
interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/ovs/confighelpers/OvsInterfaceConfigUpdateHelper.java
interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/listeners/FlowBasedServicesConfigListener.java
interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/listeners/FlowBasedServicesInterfaceStateListener.java
interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/listeners/FlowBasedServicesNodeStateListener.java
itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmInternalTunnelAddWorker.java
itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmInternalTunnelDeleteWorker.java
itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmMonitorIntervalWorker.java
itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmMonitorToggleWorker.java
itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmMonitorWorker.java
itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepAddWorker.java
itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepRemoveWorker.java
itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepsNotHostedAddWorker.java
itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepsNotHostedMoveWorker.java
itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepsNotHostedRemoveWorker.java
itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTunnelAggregationHelper.java
itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/OvsdbTepAddWorker.java
itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/OvsdbTepRemoveWorker.java
itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/InterfaceConfigListener.java
itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/InternalTunnelListener.java
itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/TerminationPointStateListener.java
itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/TunnelInventoryStateListener.java
itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/TunnelTopologyStateListener.java
itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/workers/TunnelStateAddWorkerForNodeConnector.java
itm/itm-impl/src/main/java/org/opendaylight/genius/itm/monitoring/ItmTunnelEventListener.java
mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/clustering/EntityOwnershipUtils.java
mdsalutil/mdsalutil-testutils/src/test/java/org/opendaylight/genius/datastoreutils/testutils/tests/TestableJobCoordinatorEventsWaiterTest.java

index 4ec0b2155a239c11e610a1c26f2be8cb0ad0f1ae..6aaf67d4fa4772dd2a5c9d42cf721b3bca90a628 100644 (file)
@@ -32,7 +32,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class CleanUpJob implements Callable<List<ListenableFuture<Void>>> {
+public class CleanUpJob implements Callable<List<? extends ListenableFuture<?>>> {
 
     private static final Logger LOG = LoggerFactory.getLogger(CleanUpJob.class);
 
index 000c452695fb742657d9281837ff90143887189c..c8c3876ce53fa3f2defb0d729dd1a2ca7cd8b04e 100644 (file)
@@ -24,7 +24,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class IdHolderSyncJob implements Callable<List<ListenableFuture<Void>>> {
+public class IdHolderSyncJob implements Callable<List<? extends ListenableFuture<?>>> {
 
     private static final Logger LOG = LoggerFactory.getLogger(IdHolderSyncJob.class);
 
index bf1911376f9861ee82f4301a36a432ca69be5519..259c9acc7e5ebb13a0c417c0c4cea6831142421e 100644 (file)
@@ -24,7 +24,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class LocalPoolCreateJob implements Callable<List<ListenableFuture<Void>>> {
+public class LocalPoolCreateJob implements Callable<List<? extends ListenableFuture<?>>> {
 
     private static final Logger LOG = LoggerFactory.getLogger(LocalPoolCreateJob.class);
 
index 57fa197b93c366c974c13e5c6606e8af88ae53d6..342be3bd501c70fbfeabd3418687f6417629d5dc 100644 (file)
@@ -21,7 +21,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class LocalPoolDeleteJob implements Callable<List<ListenableFuture<Void>>> {
+public class LocalPoolDeleteJob implements Callable<List<? extends ListenableFuture<?>>> {
 
     private static final Logger LOG = LoggerFactory.getLogger(LocalPoolDeleteJob.class);
 
index d60dd7712ab0f0de0c64abb3ccd7d097982fae4e..2428279af1d2b16e033cfcbd21754a25d17911f4 100644 (file)
@@ -30,7 +30,7 @@ import org.opendaylight.yangtools.yang.common.Uint32;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class UpdateIdEntryJob implements Callable<List<ListenableFuture<Void>>> {
+public class UpdateIdEntryJob implements Callable<List<? extends ListenableFuture<?>>> {
 
     private static final Logger LOG = LoggerFactory.getLogger(UpdateIdEntryJob.class);
 
index 906185bdb1c7c427f2c94c133c9f2b8b89e6b35b..6de13284a29fd6b249149003b7acabcb3f8c5320 100644 (file)
@@ -761,7 +761,7 @@ public class InterfacemgrProvider implements AutoCloseable, IInterfaceManager {
         coordinator.enqueueJob(interfaceName, parentRefUpdateWorker, IfmConstants.JOB_MAX_RETRIES);
     }
 
-    public class ParentRefUpdateWorker implements Callable<List<ListenableFuture<Void>>> {
+    public class ParentRefUpdateWorker implements Callable<List<? extends ListenableFuture<?>>> {
         String interfaceName;
         String parentInterfaceName;
         Boolean readInterfaceBeforeWrite;
index 89b9d52d55bf51d6abd840a27162397f197fc8e0..f12f0c38b8dfb3e51c7f06d32506340ab2160b1b 100644 (file)
@@ -319,7 +319,7 @@ public class InterfaceInventoryStateListener
         }
     }
 
-    private class InterfaceStateUpdateWorker implements Callable<List<ListenableFuture<Void>>> {
+    private class InterfaceStateUpdateWorker implements Callable<List<? extends ListenableFuture<?>>> {
         private final InstanceIdentifier<FlowCapableNodeConnector> key;
         private final FlowCapableNodeConnector fcNodeConnectorOld;
         private final FlowCapableNodeConnector fcNodeConnectorNew;
@@ -355,7 +355,7 @@ public class InterfaceInventoryStateListener
         }
     }
 
-    private class InterfaceStateRemoveWorker implements Callable<List<ListenableFuture<Void>>> {
+    private class InterfaceStateRemoveWorker implements Callable<List<? extends ListenableFuture<?>>> {
         private final NodeConnectorId nodeConnectorIdNew;
         private NodeConnectorId nodeConnectorIdOld;
         private final FlowCapableNodeConnector fcNodeConnectorOld;
index be715d53f017e84ce4f7b2c8f2d59b8aa68d66d2..70c0aa6dccec4f243841984b04ea72b5d1e74a9f 100644 (file)
@@ -166,7 +166,7 @@ public class InterfaceTopologyStateListener
         });
     }
 
-    private class RendererStateAddWorker implements Callable<List<ListenableFuture<Void>>> {
+    private class RendererStateAddWorker implements Callable<List<? extends ListenableFuture<?>>> {
         InstanceIdentifier<OvsdbBridgeAugmentation> instanceIdentifier;
         OvsdbBridgeAugmentation bridgeNew;
 
@@ -200,7 +200,7 @@ public class InterfaceTopologyStateListener
         }
     }
 
-    private class RendererStateRemoveWorker implements Callable<List<ListenableFuture<Void>>> {
+    private class RendererStateRemoveWorker implements Callable<List<? extends ListenableFuture<?>>> {
         InstanceIdentifier<OvsdbBridgeAugmentation> instanceIdentifier;
         OvsdbBridgeAugmentation bridgeNew;
 
@@ -238,7 +238,7 @@ public class InterfaceTopologyStateListener
         }
     }
 
-    private class RendererStateUpdateWorker implements Callable<List<ListenableFuture<Void>>> {
+    private class RendererStateUpdateWorker implements Callable<List<? extends ListenableFuture<?>>> {
         InstanceIdentifier<OvsdbBridgeAugmentation> instanceIdentifier;
         OvsdbBridgeAugmentation bridgeNew;
         OvsdbBridgeAugmentation bridgeOld;
index fec697e48cf6e1a3286e879f150367d0fb60ca55..497c491607179c25f1821ffd52e5a771e12587bc 100644 (file)
@@ -181,7 +181,7 @@ public class TerminationPointStateListener extends
         update(identifier, null, tpNew);
     }
 
-    private class RendererStateUpdateWorker implements Callable<List<ListenableFuture<Void>>> {
+    private class RendererStateUpdateWorker implements Callable<List<? extends ListenableFuture<?>>> {
         OvsdbTerminationPointAugmentation terminationPointNew;
 
         RendererStateUpdateWorker(OvsdbTerminationPointAugmentation tpNew) {
@@ -194,7 +194,7 @@ public class TerminationPointStateListener extends
         }
     }
 
-    private class RendererStateRemoveWorker implements Callable<List<ListenableFuture<Void>>> {
+    private class RendererStateRemoveWorker implements Callable<List<? extends ListenableFuture<?>>> {
         OvsdbTerminationPointAugmentation terminationPointOld;
 
         RendererStateRemoveWorker(OvsdbTerminationPointAugmentation tpNew) {
index 889e718c079f8c97e181e39b2f655bd706543966..453bc9f4de19e8aac4279258781832b4ed552294 100644 (file)
@@ -236,7 +236,7 @@ public final class OvsInterfaceConfigRemoveHelper {
         return ifState;
     }
 
-    private static class VlanMemberStateRemoveWorker implements Callable<List<ListenableFuture<Void>>> {
+    private static class VlanMemberStateRemoveWorker implements Callable<List<? extends ListenableFuture<?>>> {
         private final ManagedNewTransactionRunner txRunner;
         private final InterfaceManagerCommonUtils interfaceManagerCommonUtils;
         private final Uint64 dpId;
index 59b3d1d8eb5a4fc5b1e547596eecb1be987d381c..1ab3c8d988e2bdb8e048f78012fe7998e50a14cb 100644 (file)
@@ -197,7 +197,7 @@ public class OvsInterfaceConfigUpdateHelper {
         return newAug != null && !newAug.equals(oldAug);
     }
 
-    private static class VlanMemberStateUpdateWorker implements Callable<List<ListenableFuture<Void>>> {
+    private static class VlanMemberStateUpdateWorker implements Callable<List<? extends ListenableFuture<?>>> {
 
         private final ManagedNewTransactionRunner txRunner;
         private final OperStatus operStatus;
index 61f51c27cd40bfa0759b0dff42cde023c691e14d..dc24f7fe7c079a996d24c9cbc6159e33588059f5 100644 (file)
@@ -239,7 +239,7 @@ public class FlowBasedServicesConfigListener implements ClusteredDataTreeChangeL
         coordinator.enqueueJob(serviceKey.getInterfaceName(), configWorker, IfmConstants.JOB_MAX_RETRIES);
     }
 
-    private class RendererConfigAddWorker implements Callable<List<ListenableFuture<Void>>> {
+    private class RendererConfigAddWorker implements Callable<List<? extends ListenableFuture<?>>> {
         private final String interfaceName;
         Class<? extends ServiceModeBase> serviceMode;
         FlowBasedServicesConfigAddable flowBasedServicesAddable;
@@ -282,7 +282,7 @@ public class FlowBasedServicesConfigListener implements ClusteredDataTreeChangeL
         }
     }
 
-    private class RendererConfigRemoveWorker implements Callable<List<ListenableFuture<Void>>> {
+    private class RendererConfigRemoveWorker implements Callable<List<? extends ListenableFuture<?>>> {
         private final String interfaceName;
         Class<? extends ServiceModeBase> serviceMode;
         FlowBasedServicesConfigRemovable flowBasedServicesConfigRemovable;
index 683a0f5812f4a80cace8c2ccab4db1a3eac9e8db..d2d98710f7612619e869763e19f38de5686f2e02 100644 (file)
@@ -112,7 +112,7 @@ public class FlowBasedServicesInterfaceStateListener extends AbstractClusteredSy
         close();
     }
 
-    private class RendererStateInterfaceBindWorker implements Callable<List<ListenableFuture<Void>>> {
+    private class RendererStateInterfaceBindWorker implements Callable<List<? extends ListenableFuture<?>>> {
         Interface iface;
         FlowBasedServicesStateAddable flowBasedServicesStateAddable;
         Class<? extends ServiceModeBase> serviceMode;
index 4a1e10597924ea9e5512c379c19ee7bf9e5290e8..78014d5bd50375b02e040e4d8884dc310ec54c3b 100644 (file)
@@ -82,7 +82,7 @@ public class FlowBasedServicesNodeStateListener extends AbstractSyncDataTreeChan
         }
     }
 
-    private static class RendererStateInterfaceBindWorker implements Callable<List<ListenableFuture<Void>>> {
+    private static class RendererStateInterfaceBindWorker implements Callable<List<? extends ListenableFuture<?>>> {
         private final String iface;
         final Uint64 dpnId;
         final FlowBasedServicesStateAddable flowBasedServicesStateAddable;
index bb8c5d14edff7e917c3cee4d90d3446e5b36c995..d67ee9bfe318ed766a56f8dc1e95915665cbdd46 100644 (file)
@@ -292,7 +292,7 @@ public final class ItmInternalTunnelAddWorker {
         return logicTunnelGroupName;
     }
 
-    private static class ItmTunnelAggregationWorker implements Callable<List<ListenableFuture<Void>>> {
+    private static class ItmTunnelAggregationWorker implements Callable<List<? extends ListenableFuture<?>>> {
 
         private final String logicTunnelGroupName;
         private final Uint64 srcDpnId;
index afabf2c3ef880af087f543f8062c60b2c946a70b..2089ed58567835a104d6f2c6489eb8b4fcc5c75c 100644 (file)
@@ -332,7 +332,7 @@ public class ItmInternalTunnelDeleteWorker {
         jobCoordinator.enqueueJob(logicTunnelName, addWorker);
     }
 
-    private static class ItmTunnelAggregationDeleteWorker implements Callable<List<ListenableFuture<Void>>> {
+    private static class ItmTunnelAggregationDeleteWorker implements Callable<List<? extends ListenableFuture<?>>> {
 
         private final String logicTunnelName;
         private final Uint64 srcDpnId;
index fdbe0a9c9be079bc0b5bdb9aff73c8e64ba13c97..94c91750cce544b95a22affc9c8608f76ba74ea3 100644 (file)
@@ -24,7 +24,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ItmMonitorIntervalWorker implements Callable<List<ListenableFuture<Void>>> {
+public class ItmMonitorIntervalWorker implements Callable<List<? extends ListenableFuture<?>>> {
 
     private static final Logger LOG = LoggerFactory.getLogger(ItmMonitorIntervalWorker.class) ;
 
index b4eb04fcb0b81e3d4c73721b2c64fe933615975d..23d52e0c647b54ea69e8d66ddfe8ff665baddbca 100644 (file)
@@ -26,7 +26,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ItmMonitorToggleWorker implements Callable<List<ListenableFuture<Void>>> {
+public class ItmMonitorToggleWorker implements Callable<List<? extends ListenableFuture<?>>> {
 
     private static final Logger LOG = LoggerFactory.getLogger(ItmMonitorToggleWorker.class);
 
index 96059249e6249642a53a9a7b79e728e00a4cdbac..5886df8af6eb695ca4deab8ae4f86a4d34435d8f 100644 (file)
@@ -38,7 +38,7 @@ import org.opendaylight.yangtools.yang.common.Uint64;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ItmMonitorWorker implements Callable<List<ListenableFuture<Void>>> {
+public class ItmMonitorWorker implements Callable<List<? extends ListenableFuture<?>>> {
 
     private static final Logger LOG = LoggerFactory.getLogger(ItmMonitorWorker.class);
 
index 7ffd38ffd1bd3998d9daf33fd8c46e4dab4f21b5..d430cdb4ec1641da464c8f83003fcde67771666c 100644 (file)
@@ -27,7 +27,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ItmTepAddWorker implements Callable<List<ListenableFuture<Void>>> {
+public class ItmTepAddWorker implements Callable<List<? extends ListenableFuture<?>>> {
 
     private static final Logger LOG = LoggerFactory.getLogger(ItmTepAddWorker.class);
 
index 5974116a49e509450540dd67280efe77cd1b545a..b790d8c5c3c3d4711e684a09cc3e22284719fb7f 100644 (file)
@@ -30,7 +30,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ItmTepRemoveWorker implements Callable<List<ListenableFuture<Void>>> {
+public class ItmTepRemoveWorker implements Callable<List<? extends ListenableFuture<?>>> {
 
     private static final Logger LOG = LoggerFactory.getLogger(ItmTepRemoveWorker.class);
 
index f006142c6cbf6137e1c22cfa2c87904d06592d70..a655e884fd9f0d57ca0290c34a866c0055ca8004 100644 (file)
@@ -18,7 +18,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.rev160406.not.ho
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ItmTepsNotHostedAddWorker implements Callable<List<ListenableFuture<Void>>> {
+public class ItmTepsNotHostedAddWorker implements Callable<List<? extends ListenableFuture<?>>> {
 
     private static final Logger LOG = LoggerFactory.getLogger(ItmTepsNotHostedAddWorker.class);
     private final  List<UnknownVteps> vtepsList;
index 20a19e0143aa4f0c705fda179565b393c92607d1..643376672b09a58789225bbf42409518a86135c9 100644 (file)
@@ -18,7 +18,7 @@ import org.opendaylight.yangtools.yang.common.Uint64;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ItmTepsNotHostedMoveWorker implements Callable<List<ListenableFuture<Void>>> {
+public class ItmTepsNotHostedMoveWorker implements Callable<List<? extends ListenableFuture<?>>> {
 
     private static final Logger LOG = LoggerFactory.getLogger(ItmTepsNotHostedMoveWorker.class);
 
index efeae668e287646cf32c1b82214a3c71fedc5617..1de3b44775420c4fd868766a4807fa5fc6c77e33 100644 (file)
@@ -19,7 +19,7 @@ import org.opendaylight.yangtools.yang.common.Uint64;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ItmTepsNotHostedRemoveWorker implements Callable<List<ListenableFuture<Void>>> {
+public class ItmTepsNotHostedRemoveWorker implements Callable<List<? extends ListenableFuture<?>>> {
 
     private static final Logger LOG = LoggerFactory.getLogger(ItmTepsNotHostedRemoveWorker.class);
 
index 9a654ba329e0f0256da22a5cc020ce81796d3349..1d08f332da89a4a134e66226df807173229b3182 100644 (file)
@@ -405,7 +405,7 @@ public class ItmTunnelAggregationHelper {
         tx.merge(id, ifaceBuilderChild.build(), CREATE_MISSING_PARENTS);
     }
 
-    private class TunnelAggregationUpdateWorker implements Callable<List<ListenableFuture<Void>>> {
+    private class TunnelAggregationUpdateWorker implements Callable<List<? extends ListenableFuture<?>>> {
 
         private final Interface ifStateOrigin;
         private final Interface ifStateUpdated;
index 496a7615112fba953bb35365ab30849c375a8355..e81ed01e5b87425949c5642f9233d4b1e738f26e 100644 (file)
@@ -16,7 +16,7 @@ import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class OvsdbTepAddWorker implements Callable<List<ListenableFuture<Void>>> {
+public class OvsdbTepAddWorker implements Callable<List<? extends ListenableFuture<?>>> {
 
     private static final Logger LOG = LoggerFactory.getLogger(OvsdbTepAddWorker.class) ;
 
index 4aeb75b1a6eb24697a83b278a830937a6f09388a..6f3e6442bc803cae087be74c6ea16007152984ec 100644 (file)
@@ -16,7 +16,7 @@ import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class OvsdbTepRemoveWorker implements Callable<List<ListenableFuture<Void>>> {
+public class OvsdbTepRemoveWorker implements Callable<List<? extends ListenableFuture<?>>> {
 
     private static final Logger LOG = LoggerFactory.getLogger(OvsdbTepRemoveWorker.class) ;
 
index 2f2b6f0498091233323978f5d895428be403eb07..77c3933a4d100df9e9e8023dcd1c5620e2e46af1 100644 (file)
@@ -64,7 +64,7 @@ public class InterfaceConfigListener extends AbstractSyncDataTreeChangeListener<
         }
     }
 
-    private static class RendererConfigDeleteWorker implements Callable<List<ListenableFuture<Void>>> {
+    private static class RendererConfigDeleteWorker implements Callable<List<? extends ListenableFuture<?>>> {
         final InstanceIdentifier<Interface> key;
         final Interface interfaceNew;
 
index 7ffc987ac0f4243887f16073411752afc9c50ef0..c27d8cd267da9e761246a59296010e8930d835ca 100644 (file)
@@ -64,7 +64,7 @@ public class InternalTunnelListener extends AbstractSyncDataTreeChangeListener<I
         return "tun" + internalTunnel.getSourceDPN() + internalTunnel.getDestinationDPN();
     }
 
-    private static class RendererInternalTunnelDeleteWorker implements Callable<List<ListenableFuture<Void>>> {
+    private static class RendererInternalTunnelDeleteWorker implements Callable<List<? extends ListenableFuture<?>>> {
         final InstanceIdentifier<InternalTunnel> key;
         final InternalTunnel internalTunnel;
 
index fac0b8eda10f2bedabebd541c6f99428be57ea28..a99928dfd7d94b51dbfaf93fc274b9d47afbc128 100644 (file)
@@ -176,7 +176,7 @@ public class TerminationPointStateListener
         transaction.merge(LogicalDatastoreType.OPERATIONAL, stateTnlII, stateTnlBuilder.build(), false);
     }
 
-    private class RendererTunnelStateUpdateWorker implements Callable<List<ListenableFuture<Void>>> {
+    private class RendererTunnelStateUpdateWorker implements Callable<List<? extends ListenableFuture<?>>> {
         private final OvsdbTerminationPointAugmentation terminationPointNew;
 
         RendererTunnelStateUpdateWorker(OvsdbTerminationPointAugmentation tpNew) {
@@ -191,7 +191,7 @@ public class TerminationPointStateListener
         }
     }
 
-    private class RendererTunnelStateRemoveWorker implements Callable<List<ListenableFuture<Void>>> {
+    private class RendererTunnelStateRemoveWorker implements Callable<List<? extends ListenableFuture<?>>> {
         private final OvsdbTerminationPointAugmentation terminationPointOld;
 
         RendererTunnelStateRemoveWorker(OvsdbTerminationPointAugmentation tpNew) {
index af3b77a78a272577e6b5bf8ef25abe61866e14e3..fb0bcdb8a9b0e073e80deab724ec9b929004341b 100644 (file)
@@ -425,7 +425,7 @@ public class TunnelInventoryStateListener extends
         return futures;
     }
 
-    private class TunnelInterfaceStateUpdateWorker implements Callable<List<ListenableFuture<Void>>> {
+    private class TunnelInterfaceStateUpdateWorker implements Callable<List<? extends ListenableFuture<?>>> {
         private final InstanceIdentifier<FlowCapableNodeConnector> key;
         private final FlowCapableNodeConnector fcNodeConnectorOld;
         private final FlowCapableNodeConnector fcNodeConnectorNew;
@@ -454,7 +454,7 @@ public class TunnelInventoryStateListener extends
         }
     }
 
-    private class TunnelInterfaceStateRemoveWorker implements Callable<List<ListenableFuture<Void>>> {
+    private class TunnelInterfaceStateRemoveWorker implements Callable<List<? extends ListenableFuture<?>>> {
         private final NodeConnectorId nodeConnectorId;
         private final FlowCapableNodeConnector flowCapableNodeConnector;
         private final String interfaceName;
index eda5893d3e8955b323f44698a957aeedff146d33..dd2133001d08204cec803d762d53a3304df2e008 100644 (file)
@@ -234,7 +234,7 @@ public class TunnelTopologyStateListener extends AbstractClusteredSyncDataTreeCh
         }
     }
 
-    private class TunnelRendererStateAddWorker implements Callable<List<ListenableFuture<Void>>> {
+    private class TunnelRendererStateAddWorker implements Callable<List<? extends ListenableFuture<?>>> {
         private final InstanceIdentifier<OvsdbBridgeAugmentation> bridgeIid;
         private final OvsdbBridgeAugmentation bridgeNew;
 
@@ -271,7 +271,7 @@ public class TunnelTopologyStateListener extends AbstractClusteredSyncDataTreeCh
         }
     }
 
-    private class TunnelRendererStateRemoveWorker implements Callable<List<ListenableFuture<Void>>> {
+    private class TunnelRendererStateRemoveWorker implements Callable<List<? extends ListenableFuture<?>>> {
         private final InstanceIdentifier<OvsdbBridgeAugmentation> instanceIdentifier;
         private final OvsdbBridgeAugmentation bridgeNew;
 
@@ -289,7 +289,7 @@ public class TunnelTopologyStateListener extends AbstractClusteredSyncDataTreeCh
         }
     }
 
-    private class TunnelRendererStateUpdateWorker implements Callable<List<ListenableFuture<Void>>> {
+    private class TunnelRendererStateUpdateWorker implements Callable<List<? extends ListenableFuture<?>>> {
         private final InstanceIdentifier<OvsdbBridgeAugmentation> instanceIdentifier;
         private final OvsdbBridgeAugmentation bridgeNew;
         private final OvsdbBridgeAugmentation bridgeOld;
index 4485ced83799b438fb039befa8f50d4e95af898e..3b1875cb0a868ccb5aadd65d43cac8acc52bb2a0 100644 (file)
@@ -12,7 +12,7 @@ import java.util.List;
 import java.util.concurrent.Callable;
 import org.opendaylight.genius.itm.utils.TunnelStateInfo;
 
-public class TunnelStateAddWorkerForNodeConnector implements Callable<List<ListenableFuture<Void>>> {
+public class TunnelStateAddWorkerForNodeConnector implements Callable<List<? extends ListenableFuture<?>>> {
     private final TunnelStateAddWorker tunnelStateAddWorker;
     private final TunnelStateInfo tunnelStateInfo;
 
index 5692607561af7a7b15946234368e53d02aef45c1..1e259d2c031cf064021fe5dfcb0c56fb01a645ac 100644 (file)
@@ -206,7 +206,7 @@ public class ItmTunnelEventListener extends AbstractSyncDataTreeChangeListener<S
         return alarmText.toString();
     }
 
-    private class ItmTunnelAddAlarmWorker implements Callable<List<ListenableFuture<Void>>> {
+    private class ItmTunnelAddAlarmWorker implements Callable<List<? extends ListenableFuture<?>>> {
         private final StateTunnelList add;
 
         ItmTunnelAddAlarmWorker(StateTunnelList tnlIface) {
@@ -251,7 +251,7 @@ public class ItmTunnelEventListener extends AbstractSyncDataTreeChangeListener<S
         }
     }
 
-    private class ItmTunnelRemoveAlarmWorker implements Callable<List<ListenableFuture<Void>>> {
+    private class ItmTunnelRemoveAlarmWorker implements Callable<List<? extends ListenableFuture<?>>> {
         private final StateTunnelList del;
 
         ItmTunnelRemoveAlarmWorker(StateTunnelList tnlIface) {
@@ -286,7 +286,7 @@ public class ItmTunnelEventListener extends AbstractSyncDataTreeChangeListener<S
         }
     }
 
-    private class ItmTunnelUpdateAlarmWorker implements Callable<List<ListenableFuture<Void>>> {
+    private class ItmTunnelUpdateAlarmWorker implements Callable<List<? extends ListenableFuture<?>>> {
         private final StateTunnelList update;
         private final StateTunnelList original;
 
@@ -357,7 +357,7 @@ public class ItmTunnelEventListener extends AbstractSyncDataTreeChangeListener<S
         }
     }
 
-    private static class ItmTunnelStatusOutOfOrderEventWorker implements Callable<List<ListenableFuture<Void>>> {
+    private static class ItmTunnelStatusOutOfOrderEventWorker implements Callable<List<? extends ListenableFuture<?>>> {
         private final InstanceIdentifier<StateTunnelList> identifier;
         private final StateTunnelList add;
         private final TunnelOperStatus operStatus;
index cd7910d7f35d19356d0d3e1ed6bef02223e2a043..64133a85631c48decfb7e97a70af021bbe120591 100644 (file)
@@ -132,7 +132,7 @@ public class EntityOwnershipUtils {
      * @param job the job task
      */
     public void runOnlyInOwnerNode(String entityType, String entityName, JobCoordinator coordinator,
-            String jobKey, String jobDesc, Callable<List<ListenableFuture<Void>>> job) {
+            String jobKey, String jobDesc, Callable<List<? extends ListenableFuture<?>>> job) {
         final Entity entity = new Entity(entityType, entityName);
         coordinator.enqueueJob(getEntityIdentifierString(entityType, entityName), () -> {
             if (isEntityOwner(entity)) {
index 734756233023af1c0b8b31dd24214bc2ad4962b2..12d0aa1a30fbef8cf85272aa85805d5c7308b195 100644 (file)
@@ -37,7 +37,7 @@ import org.opendaylight.infrautils.testutils.RunUntilFailureRule;
  */
 public class TestableJobCoordinatorEventsWaiterTest {
 
-    private static class TestCallable implements Callable<List<ListenableFuture<Void>>> {
+    private static class TestCallable implements Callable<List<? extends ListenableFuture<?>>> {
 
         boolean wasCalled = false;
         AtomicInteger invocationCount = new AtomicInteger();