From 181d7b586e07d1509779c0d2e84c704296430cee Mon Sep 17 00:00:00 2001 From: Chetan Arakere Gowdru Date: Tue, 14 Apr 2020 16:45:09 +0530 Subject: [PATCH] InfraUtil JobCordinator Changes. Desc: https://git.opendaylight.org/gerrit/c/infrautils/+/89057 Change-Id: I76744bf161cc6d1edadf013f2310f6aa6bb1efae Signed-off-by: Chetan Arakere Gowdru Signed-off-by: R P Karthika --- .../opendaylight/genius/idmanager/jobs/CleanUpJob.java | 2 +- .../genius/idmanager/jobs/IdHolderSyncJob.java | 2 +- .../genius/idmanager/jobs/LocalPoolCreateJob.java | 2 +- .../genius/idmanager/jobs/LocalPoolDeleteJob.java | 2 +- .../genius/idmanager/jobs/UpdateIdEntryJob.java | 2 +- .../genius/interfacemanager/InterfacemgrProvider.java | 2 +- .../listeners/InterfaceInventoryStateListener.java | 4 ++-- .../listeners/InterfaceTopologyStateListener.java | 6 +++--- .../listeners/TerminationPointStateListener.java | 4 ++-- .../ovs/confighelpers/OvsInterfaceConfigRemoveHelper.java | 2 +- .../ovs/confighelpers/OvsInterfaceConfigUpdateHelper.java | 2 +- .../listeners/FlowBasedServicesConfigListener.java | 4 ++-- .../FlowBasedServicesInterfaceStateListener.java | 2 +- .../listeners/FlowBasedServicesNodeStateListener.java | 2 +- .../itm/confighelpers/ItmInternalTunnelAddWorker.java | 2 +- .../itm/confighelpers/ItmInternalTunnelDeleteWorker.java | 2 +- .../itm/confighelpers/ItmMonitorIntervalWorker.java | 2 +- .../genius/itm/confighelpers/ItmMonitorToggleWorker.java | 2 +- .../genius/itm/confighelpers/ItmMonitorWorker.java | 2 +- .../genius/itm/confighelpers/ItmTepAddWorker.java | 2 +- .../genius/itm/confighelpers/ItmTepRemoveWorker.java | 2 +- .../itm/confighelpers/ItmTepsNotHostedAddWorker.java | 2 +- .../itm/confighelpers/ItmTepsNotHostedMoveWorker.java | 2 +- .../itm/confighelpers/ItmTepsNotHostedRemoveWorker.java | 2 +- .../itm/confighelpers/ItmTunnelAggregationHelper.java | 2 +- .../genius/itm/confighelpers/OvsdbTepAddWorker.java | 2 +- .../genius/itm/confighelpers/OvsdbTepRemoveWorker.java | 2 +- .../listeners/InterfaceConfigListener.java | 2 +- .../listeners/InternalTunnelListener.java | 2 +- .../listeners/TerminationPointStateListener.java | 4 ++-- .../listeners/TunnelInventoryStateListener.java | 4 ++-- .../listeners/TunnelTopologyStateListener.java | 6 +++--- .../workers/TunnelStateAddWorkerForNodeConnector.java | 2 +- .../genius/itm/monitoring/ItmTunnelEventListener.java | 8 ++++---- .../genius/utils/clustering/EntityOwnershipUtils.java | 2 +- .../tests/TestableJobCoordinatorEventsWaiterTest.java | 2 +- 36 files changed, 48 insertions(+), 48 deletions(-) diff --git a/idmanager/idmanager-impl/src/main/java/org/opendaylight/genius/idmanager/jobs/CleanUpJob.java b/idmanager/idmanager-impl/src/main/java/org/opendaylight/genius/idmanager/jobs/CleanUpJob.java index 4ec0b2155..6aaf67d4f 100644 --- a/idmanager/idmanager-impl/src/main/java/org/opendaylight/genius/idmanager/jobs/CleanUpJob.java +++ b/idmanager/idmanager-impl/src/main/java/org/opendaylight/genius/idmanager/jobs/CleanUpJob.java @@ -32,7 +32,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class CleanUpJob implements Callable>> { +public class CleanUpJob implements Callable>> { private static final Logger LOG = LoggerFactory.getLogger(CleanUpJob.class); diff --git a/idmanager/idmanager-impl/src/main/java/org/opendaylight/genius/idmanager/jobs/IdHolderSyncJob.java b/idmanager/idmanager-impl/src/main/java/org/opendaylight/genius/idmanager/jobs/IdHolderSyncJob.java index 000c45269..c8c3876ce 100644 --- a/idmanager/idmanager-impl/src/main/java/org/opendaylight/genius/idmanager/jobs/IdHolderSyncJob.java +++ b/idmanager/idmanager-impl/src/main/java/org/opendaylight/genius/idmanager/jobs/IdHolderSyncJob.java @@ -24,7 +24,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class IdHolderSyncJob implements Callable>> { +public class IdHolderSyncJob implements Callable>> { private static final Logger LOG = LoggerFactory.getLogger(IdHolderSyncJob.class); diff --git a/idmanager/idmanager-impl/src/main/java/org/opendaylight/genius/idmanager/jobs/LocalPoolCreateJob.java b/idmanager/idmanager-impl/src/main/java/org/opendaylight/genius/idmanager/jobs/LocalPoolCreateJob.java index bf1911376..259c9acc7 100644 --- a/idmanager/idmanager-impl/src/main/java/org/opendaylight/genius/idmanager/jobs/LocalPoolCreateJob.java +++ b/idmanager/idmanager-impl/src/main/java/org/opendaylight/genius/idmanager/jobs/LocalPoolCreateJob.java @@ -24,7 +24,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class LocalPoolCreateJob implements Callable>> { +public class LocalPoolCreateJob implements Callable>> { private static final Logger LOG = LoggerFactory.getLogger(LocalPoolCreateJob.class); diff --git a/idmanager/idmanager-impl/src/main/java/org/opendaylight/genius/idmanager/jobs/LocalPoolDeleteJob.java b/idmanager/idmanager-impl/src/main/java/org/opendaylight/genius/idmanager/jobs/LocalPoolDeleteJob.java index 57fa197b9..342be3bd5 100644 --- a/idmanager/idmanager-impl/src/main/java/org/opendaylight/genius/idmanager/jobs/LocalPoolDeleteJob.java +++ b/idmanager/idmanager-impl/src/main/java/org/opendaylight/genius/idmanager/jobs/LocalPoolDeleteJob.java @@ -21,7 +21,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class LocalPoolDeleteJob implements Callable>> { +public class LocalPoolDeleteJob implements Callable>> { private static final Logger LOG = LoggerFactory.getLogger(LocalPoolDeleteJob.class); diff --git a/idmanager/idmanager-impl/src/main/java/org/opendaylight/genius/idmanager/jobs/UpdateIdEntryJob.java b/idmanager/idmanager-impl/src/main/java/org/opendaylight/genius/idmanager/jobs/UpdateIdEntryJob.java index d60dd7712..2428279af 100644 --- a/idmanager/idmanager-impl/src/main/java/org/opendaylight/genius/idmanager/jobs/UpdateIdEntryJob.java +++ b/idmanager/idmanager-impl/src/main/java/org/opendaylight/genius/idmanager/jobs/UpdateIdEntryJob.java @@ -30,7 +30,7 @@ import org.opendaylight.yangtools.yang.common.Uint32; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class UpdateIdEntryJob implements Callable>> { +public class UpdateIdEntryJob implements Callable>> { private static final Logger LOG = LoggerFactory.getLogger(UpdateIdEntryJob.class); diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/InterfacemgrProvider.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/InterfacemgrProvider.java index 906185bdb..6de13284a 100644 --- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/InterfacemgrProvider.java +++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/InterfacemgrProvider.java @@ -761,7 +761,7 @@ public class InterfacemgrProvider implements AutoCloseable, IInterfaceManager { coordinator.enqueueJob(interfaceName, parentRefUpdateWorker, IfmConstants.JOB_MAX_RETRIES); } - public class ParentRefUpdateWorker implements Callable>> { + public class ParentRefUpdateWorker implements Callable>> { String interfaceName; String parentInterfaceName; Boolean readInterfaceBeforeWrite; diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/listeners/InterfaceInventoryStateListener.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/listeners/InterfaceInventoryStateListener.java index 89b9d52d5..f12f0c38b 100644 --- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/listeners/InterfaceInventoryStateListener.java +++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/listeners/InterfaceInventoryStateListener.java @@ -319,7 +319,7 @@ public class InterfaceInventoryStateListener } } - private class InterfaceStateUpdateWorker implements Callable>> { + private class InterfaceStateUpdateWorker implements Callable>> { private final InstanceIdentifier key; private final FlowCapableNodeConnector fcNodeConnectorOld; private final FlowCapableNodeConnector fcNodeConnectorNew; @@ -355,7 +355,7 @@ public class InterfaceInventoryStateListener } } - private class InterfaceStateRemoveWorker implements Callable>> { + private class InterfaceStateRemoveWorker implements Callable>> { private final NodeConnectorId nodeConnectorIdNew; private NodeConnectorId nodeConnectorIdOld; private final FlowCapableNodeConnector fcNodeConnectorOld; diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/listeners/InterfaceTopologyStateListener.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/listeners/InterfaceTopologyStateListener.java index be715d53f..70c0aa6dc 100644 --- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/listeners/InterfaceTopologyStateListener.java +++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/listeners/InterfaceTopologyStateListener.java @@ -166,7 +166,7 @@ public class InterfaceTopologyStateListener }); } - private class RendererStateAddWorker implements Callable>> { + private class RendererStateAddWorker implements Callable>> { InstanceIdentifier instanceIdentifier; OvsdbBridgeAugmentation bridgeNew; @@ -200,7 +200,7 @@ public class InterfaceTopologyStateListener } } - private class RendererStateRemoveWorker implements Callable>> { + private class RendererStateRemoveWorker implements Callable>> { InstanceIdentifier instanceIdentifier; OvsdbBridgeAugmentation bridgeNew; @@ -238,7 +238,7 @@ public class InterfaceTopologyStateListener } } - private class RendererStateUpdateWorker implements Callable>> { + private class RendererStateUpdateWorker implements Callable>> { InstanceIdentifier instanceIdentifier; OvsdbBridgeAugmentation bridgeNew; OvsdbBridgeAugmentation bridgeOld; diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/listeners/TerminationPointStateListener.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/listeners/TerminationPointStateListener.java index fec697e48..497c49160 100644 --- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/listeners/TerminationPointStateListener.java +++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/listeners/TerminationPointStateListener.java @@ -181,7 +181,7 @@ public class TerminationPointStateListener extends update(identifier, null, tpNew); } - private class RendererStateUpdateWorker implements Callable>> { + private class RendererStateUpdateWorker implements Callable>> { OvsdbTerminationPointAugmentation terminationPointNew; RendererStateUpdateWorker(OvsdbTerminationPointAugmentation tpNew) { @@ -194,7 +194,7 @@ public class TerminationPointStateListener extends } } - private class RendererStateRemoveWorker implements Callable>> { + private class RendererStateRemoveWorker implements Callable>> { OvsdbTerminationPointAugmentation terminationPointOld; RendererStateRemoveWorker(OvsdbTerminationPointAugmentation tpNew) { diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/ovs/confighelpers/OvsInterfaceConfigRemoveHelper.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/ovs/confighelpers/OvsInterfaceConfigRemoveHelper.java index 889e718c0..453bc9f4d 100644 --- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/ovs/confighelpers/OvsInterfaceConfigRemoveHelper.java +++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/ovs/confighelpers/OvsInterfaceConfigRemoveHelper.java @@ -236,7 +236,7 @@ public final class OvsInterfaceConfigRemoveHelper { return ifState; } - private static class VlanMemberStateRemoveWorker implements Callable>> { + private static class VlanMemberStateRemoveWorker implements Callable>> { private final ManagedNewTransactionRunner txRunner; private final InterfaceManagerCommonUtils interfaceManagerCommonUtils; private final Uint64 dpId; diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/ovs/confighelpers/OvsInterfaceConfigUpdateHelper.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/ovs/confighelpers/OvsInterfaceConfigUpdateHelper.java index 59b3d1d8e..1ab3c8d98 100644 --- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/ovs/confighelpers/OvsInterfaceConfigUpdateHelper.java +++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/ovs/confighelpers/OvsInterfaceConfigUpdateHelper.java @@ -197,7 +197,7 @@ public class OvsInterfaceConfigUpdateHelper { return newAug != null && !newAug.equals(oldAug); } - private static class VlanMemberStateUpdateWorker implements Callable>> { + private static class VlanMemberStateUpdateWorker implements Callable>> { private final ManagedNewTransactionRunner txRunner; private final OperStatus operStatus; diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/listeners/FlowBasedServicesConfigListener.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/listeners/FlowBasedServicesConfigListener.java index 61f51c27c..dc24f7fe7 100644 --- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/listeners/FlowBasedServicesConfigListener.java +++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/listeners/FlowBasedServicesConfigListener.java @@ -239,7 +239,7 @@ public class FlowBasedServicesConfigListener implements ClusteredDataTreeChangeL coordinator.enqueueJob(serviceKey.getInterfaceName(), configWorker, IfmConstants.JOB_MAX_RETRIES); } - private class RendererConfigAddWorker implements Callable>> { + private class RendererConfigAddWorker implements Callable>> { private final String interfaceName; Class serviceMode; FlowBasedServicesConfigAddable flowBasedServicesAddable; @@ -282,7 +282,7 @@ public class FlowBasedServicesConfigListener implements ClusteredDataTreeChangeL } } - private class RendererConfigRemoveWorker implements Callable>> { + private class RendererConfigRemoveWorker implements Callable>> { private final String interfaceName; Class serviceMode; FlowBasedServicesConfigRemovable flowBasedServicesConfigRemovable; diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/listeners/FlowBasedServicesInterfaceStateListener.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/listeners/FlowBasedServicesInterfaceStateListener.java index 683a0f581..d2d98710f 100644 --- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/listeners/FlowBasedServicesInterfaceStateListener.java +++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/listeners/FlowBasedServicesInterfaceStateListener.java @@ -112,7 +112,7 @@ public class FlowBasedServicesInterfaceStateListener extends AbstractClusteredSy close(); } - private class RendererStateInterfaceBindWorker implements Callable>> { + private class RendererStateInterfaceBindWorker implements Callable>> { Interface iface; FlowBasedServicesStateAddable flowBasedServicesStateAddable; Class serviceMode; diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/listeners/FlowBasedServicesNodeStateListener.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/listeners/FlowBasedServicesNodeStateListener.java index 4a1e10597..78014d5bd 100644 --- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/listeners/FlowBasedServicesNodeStateListener.java +++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/listeners/FlowBasedServicesNodeStateListener.java @@ -82,7 +82,7 @@ public class FlowBasedServicesNodeStateListener extends AbstractSyncDataTreeChan } } - private static class RendererStateInterfaceBindWorker implements Callable>> { + private static class RendererStateInterfaceBindWorker implements Callable>> { private final String iface; final Uint64 dpnId; final FlowBasedServicesStateAddable flowBasedServicesStateAddable; diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmInternalTunnelAddWorker.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmInternalTunnelAddWorker.java index bb8c5d14e..d67ee9bfe 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmInternalTunnelAddWorker.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmInternalTunnelAddWorker.java @@ -292,7 +292,7 @@ public final class ItmInternalTunnelAddWorker { return logicTunnelGroupName; } - private static class ItmTunnelAggregationWorker implements Callable>> { + private static class ItmTunnelAggregationWorker implements Callable>> { private final String logicTunnelGroupName; private final Uint64 srcDpnId; diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmInternalTunnelDeleteWorker.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmInternalTunnelDeleteWorker.java index afabf2c3e..2089ed585 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmInternalTunnelDeleteWorker.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmInternalTunnelDeleteWorker.java @@ -332,7 +332,7 @@ public class ItmInternalTunnelDeleteWorker { jobCoordinator.enqueueJob(logicTunnelName, addWorker); } - private static class ItmTunnelAggregationDeleteWorker implements Callable>> { + private static class ItmTunnelAggregationDeleteWorker implements Callable>> { private final String logicTunnelName; private final Uint64 srcDpnId; diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmMonitorIntervalWorker.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmMonitorIntervalWorker.java index fdbe0a9c9..94c91750c 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmMonitorIntervalWorker.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmMonitorIntervalWorker.java @@ -24,7 +24,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ItmMonitorIntervalWorker implements Callable>> { +public class ItmMonitorIntervalWorker implements Callable>> { private static final Logger LOG = LoggerFactory.getLogger(ItmMonitorIntervalWorker.class) ; diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmMonitorToggleWorker.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmMonitorToggleWorker.java index b4eb04fcb..23d52e0c6 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmMonitorToggleWorker.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmMonitorToggleWorker.java @@ -26,7 +26,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ItmMonitorToggleWorker implements Callable>> { +public class ItmMonitorToggleWorker implements Callable>> { private static final Logger LOG = LoggerFactory.getLogger(ItmMonitorToggleWorker.class); diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmMonitorWorker.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmMonitorWorker.java index 96059249e..5886df8af 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmMonitorWorker.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmMonitorWorker.java @@ -38,7 +38,7 @@ import org.opendaylight.yangtools.yang.common.Uint64; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ItmMonitorWorker implements Callable>> { +public class ItmMonitorWorker implements Callable>> { private static final Logger LOG = LoggerFactory.getLogger(ItmMonitorWorker.class); diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepAddWorker.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepAddWorker.java index 7ffd38ffd..d430cdb4e 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepAddWorker.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepAddWorker.java @@ -27,7 +27,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ItmTepAddWorker implements Callable>> { +public class ItmTepAddWorker implements Callable>> { private static final Logger LOG = LoggerFactory.getLogger(ItmTepAddWorker.class); diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepRemoveWorker.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepRemoveWorker.java index 5974116a4..b790d8c5c 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepRemoveWorker.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepRemoveWorker.java @@ -30,7 +30,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ItmTepRemoveWorker implements Callable>> { +public class ItmTepRemoveWorker implements Callable>> { private static final Logger LOG = LoggerFactory.getLogger(ItmTepRemoveWorker.class); diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepsNotHostedAddWorker.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepsNotHostedAddWorker.java index f006142c6..a655e884f 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepsNotHostedAddWorker.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepsNotHostedAddWorker.java @@ -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>> { +public class ItmTepsNotHostedAddWorker implements Callable>> { private static final Logger LOG = LoggerFactory.getLogger(ItmTepsNotHostedAddWorker.class); private final List vtepsList; diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepsNotHostedMoveWorker.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepsNotHostedMoveWorker.java index 20a19e014..643376672 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepsNotHostedMoveWorker.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepsNotHostedMoveWorker.java @@ -18,7 +18,7 @@ import org.opendaylight.yangtools.yang.common.Uint64; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ItmTepsNotHostedMoveWorker implements Callable>> { +public class ItmTepsNotHostedMoveWorker implements Callable>> { private static final Logger LOG = LoggerFactory.getLogger(ItmTepsNotHostedMoveWorker.class); diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepsNotHostedRemoveWorker.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepsNotHostedRemoveWorker.java index efeae668e..1de3b4477 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepsNotHostedRemoveWorker.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTepsNotHostedRemoveWorker.java @@ -19,7 +19,7 @@ import org.opendaylight.yangtools.yang.common.Uint64; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ItmTepsNotHostedRemoveWorker implements Callable>> { +public class ItmTepsNotHostedRemoveWorker implements Callable>> { private static final Logger LOG = LoggerFactory.getLogger(ItmTepsNotHostedRemoveWorker.class); diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTunnelAggregationHelper.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTunnelAggregationHelper.java index 9a654ba32..1d08f332d 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTunnelAggregationHelper.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTunnelAggregationHelper.java @@ -405,7 +405,7 @@ public class ItmTunnelAggregationHelper { tx.merge(id, ifaceBuilderChild.build(), CREATE_MISSING_PARENTS); } - private class TunnelAggregationUpdateWorker implements Callable>> { + private class TunnelAggregationUpdateWorker implements Callable>> { private final Interface ifStateOrigin; private final Interface ifStateUpdated; diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/OvsdbTepAddWorker.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/OvsdbTepAddWorker.java index 496a76151..e81ed01e5 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/OvsdbTepAddWorker.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/OvsdbTepAddWorker.java @@ -16,7 +16,7 @@ import org.opendaylight.mdsal.binding.api.DataBroker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class OvsdbTepAddWorker implements Callable>> { +public class OvsdbTepAddWorker implements Callable>> { private static final Logger LOG = LoggerFactory.getLogger(OvsdbTepAddWorker.class) ; diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/OvsdbTepRemoveWorker.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/OvsdbTepRemoveWorker.java index 4aeb75b1a..6f3e6442b 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/OvsdbTepRemoveWorker.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/OvsdbTepRemoveWorker.java @@ -16,7 +16,7 @@ import org.opendaylight.mdsal.binding.api.DataBroker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class OvsdbTepRemoveWorker implements Callable>> { +public class OvsdbTepRemoveWorker implements Callable>> { private static final Logger LOG = LoggerFactory.getLogger(OvsdbTepRemoveWorker.class) ; diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/InterfaceConfigListener.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/InterfaceConfigListener.java index 2f2b6f049..77c3933a4 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/InterfaceConfigListener.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/InterfaceConfigListener.java @@ -64,7 +64,7 @@ public class InterfaceConfigListener extends AbstractSyncDataTreeChangeListener< } } - private static class RendererConfigDeleteWorker implements Callable>> { + private static class RendererConfigDeleteWorker implements Callable>> { final InstanceIdentifier key; final Interface interfaceNew; diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/InternalTunnelListener.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/InternalTunnelListener.java index 7ffc987ac..c27d8cd26 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/InternalTunnelListener.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/InternalTunnelListener.java @@ -64,7 +64,7 @@ public class InternalTunnelListener extends AbstractSyncDataTreeChangeListener>> { + private static class RendererInternalTunnelDeleteWorker implements Callable>> { final InstanceIdentifier key; final InternalTunnel internalTunnel; diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/TerminationPointStateListener.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/TerminationPointStateListener.java index fac0b8eda..a99928dfd 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/TerminationPointStateListener.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/TerminationPointStateListener.java @@ -176,7 +176,7 @@ public class TerminationPointStateListener transaction.merge(LogicalDatastoreType.OPERATIONAL, stateTnlII, stateTnlBuilder.build(), false); } - private class RendererTunnelStateUpdateWorker implements Callable>> { + private class RendererTunnelStateUpdateWorker implements Callable>> { private final OvsdbTerminationPointAugmentation terminationPointNew; RendererTunnelStateUpdateWorker(OvsdbTerminationPointAugmentation tpNew) { @@ -191,7 +191,7 @@ public class TerminationPointStateListener } } - private class RendererTunnelStateRemoveWorker implements Callable>> { + private class RendererTunnelStateRemoveWorker implements Callable>> { private final OvsdbTerminationPointAugmentation terminationPointOld; RendererTunnelStateRemoveWorker(OvsdbTerminationPointAugmentation tpNew) { diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/TunnelInventoryStateListener.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/TunnelInventoryStateListener.java index af3b77a78..fb0bcdb8a 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/TunnelInventoryStateListener.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/TunnelInventoryStateListener.java @@ -425,7 +425,7 @@ public class TunnelInventoryStateListener extends return futures; } - private class TunnelInterfaceStateUpdateWorker implements Callable>> { + private class TunnelInterfaceStateUpdateWorker implements Callable>> { private final InstanceIdentifier key; private final FlowCapableNodeConnector fcNodeConnectorOld; private final FlowCapableNodeConnector fcNodeConnectorNew; @@ -454,7 +454,7 @@ public class TunnelInventoryStateListener extends } } - private class TunnelInterfaceStateRemoveWorker implements Callable>> { + private class TunnelInterfaceStateRemoveWorker implements Callable>> { private final NodeConnectorId nodeConnectorId; private final FlowCapableNodeConnector flowCapableNodeConnector; private final String interfaceName; diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/TunnelTopologyStateListener.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/TunnelTopologyStateListener.java index eda5893d3..dd2133001 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/TunnelTopologyStateListener.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/listeners/TunnelTopologyStateListener.java @@ -234,7 +234,7 @@ public class TunnelTopologyStateListener extends AbstractClusteredSyncDataTreeCh } } - private class TunnelRendererStateAddWorker implements Callable>> { + private class TunnelRendererStateAddWorker implements Callable>> { private final InstanceIdentifier bridgeIid; private final OvsdbBridgeAugmentation bridgeNew; @@ -271,7 +271,7 @@ public class TunnelTopologyStateListener extends AbstractClusteredSyncDataTreeCh } } - private class TunnelRendererStateRemoveWorker implements Callable>> { + private class TunnelRendererStateRemoveWorker implements Callable>> { private final InstanceIdentifier instanceIdentifier; private final OvsdbBridgeAugmentation bridgeNew; @@ -289,7 +289,7 @@ public class TunnelTopologyStateListener extends AbstractClusteredSyncDataTreeCh } } - private class TunnelRendererStateUpdateWorker implements Callable>> { + private class TunnelRendererStateUpdateWorker implements Callable>> { private final InstanceIdentifier instanceIdentifier; private final OvsdbBridgeAugmentation bridgeNew; private final OvsdbBridgeAugmentation bridgeOld; diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/workers/TunnelStateAddWorkerForNodeConnector.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/workers/TunnelStateAddWorkerForNodeConnector.java index 4485ced83..3b1875cb0 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/workers/TunnelStateAddWorkerForNodeConnector.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/itmdirecttunnels/workers/TunnelStateAddWorkerForNodeConnector.java @@ -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>> { +public class TunnelStateAddWorkerForNodeConnector implements Callable>> { private final TunnelStateAddWorker tunnelStateAddWorker; private final TunnelStateInfo tunnelStateInfo; diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/monitoring/ItmTunnelEventListener.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/monitoring/ItmTunnelEventListener.java index 569260756..1e259d2c0 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/monitoring/ItmTunnelEventListener.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/monitoring/ItmTunnelEventListener.java @@ -206,7 +206,7 @@ public class ItmTunnelEventListener extends AbstractSyncDataTreeChangeListener>> { + private class ItmTunnelAddAlarmWorker implements Callable>> { private final StateTunnelList add; ItmTunnelAddAlarmWorker(StateTunnelList tnlIface) { @@ -251,7 +251,7 @@ public class ItmTunnelEventListener extends AbstractSyncDataTreeChangeListener>> { + private class ItmTunnelRemoveAlarmWorker implements Callable>> { private final StateTunnelList del; ItmTunnelRemoveAlarmWorker(StateTunnelList tnlIface) { @@ -286,7 +286,7 @@ public class ItmTunnelEventListener extends AbstractSyncDataTreeChangeListener>> { + private class ItmTunnelUpdateAlarmWorker implements Callable>> { private final StateTunnelList update; private final StateTunnelList original; @@ -357,7 +357,7 @@ public class ItmTunnelEventListener extends AbstractSyncDataTreeChangeListener>> { + private static class ItmTunnelStatusOutOfOrderEventWorker implements Callable>> { private final InstanceIdentifier identifier; private final StateTunnelList add; private final TunnelOperStatus operStatus; diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/clustering/EntityOwnershipUtils.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/clustering/EntityOwnershipUtils.java index cd7910d7f..64133a856 100644 --- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/clustering/EntityOwnershipUtils.java +++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/clustering/EntityOwnershipUtils.java @@ -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>> job) { + String jobKey, String jobDesc, Callable>> job) { final Entity entity = new Entity(entityType, entityName); coordinator.enqueueJob(getEntityIdentifierString(entityType, entityName), () -> { if (isEntityOwner(entity)) { diff --git a/mdsalutil/mdsalutil-testutils/src/test/java/org/opendaylight/genius/datastoreutils/testutils/tests/TestableJobCoordinatorEventsWaiterTest.java b/mdsalutil/mdsalutil-testutils/src/test/java/org/opendaylight/genius/datastoreutils/testutils/tests/TestableJobCoordinatorEventsWaiterTest.java index 734756233..12d0aa1a3 100644 --- a/mdsalutil/mdsalutil-testutils/src/test/java/org/opendaylight/genius/datastoreutils/testutils/tests/TestableJobCoordinatorEventsWaiterTest.java +++ b/mdsalutil/mdsalutil-testutils/src/test/java/org/opendaylight/genius/datastoreutils/testutils/tests/TestableJobCoordinatorEventsWaiterTest.java @@ -37,7 +37,7 @@ import org.opendaylight.infrautils.testutils.RunUntilFailureRule; */ public class TestableJobCoordinatorEventsWaiterTest { - private static class TestCallable implements Callable>> { + private static class TestCallable implements Callable>> { boolean wasCalled = false; AtomicInteger invocationCount = new AtomicInteger(); -- 2.36.6