From da432867d3ce41ceab426b1ef546d247a1222078 Mon Sep 17 00:00:00 2001 From: "Claudio D. Gasparini" Date: Mon, 13 Mar 2017 18:01:06 +0100 Subject: [PATCH] Code Clean Up Fix instance fields not accessed with this Change-Id: Iec1520fa728ea21098dd5a79dbfa25837b117e1c Signed-off-by: Claudio D. Gasparini --- .../bmp/impl/BmpDispatcherImplModule.java | 2 +- .../protocol/bmp/impl/app/BmpRouterImpl.java | 6 +-- .../bmp/impl/app/RouterSessionManager.java | 4 +- .../protocol/bmp/impl/app/TableContext.java | 4 +- .../bmp/impl/session/BmpSessionImpl.java | 4 +- .../yang/bmp/impl/AbstractBmpModuleTest.java | 8 ++-- .../impl/session/BmpTestSessionListener.java | 2 +- .../protocol/bmp/mock/BmpMockDispatcher.java | 2 +- .../protocol/bmp/mock/BmpMockSessionTest.java | 8 ++-- .../protocol/bmp/mock/BmpMockTest.java | 4 +- ...eBmpExtensionProviderContextActivator.java | 10 ++-- .../bgp/concepts/RouteDistinguisherUtil.java | 2 +- .../tunnel/identifier/TunnelType.java | 4 +- .../protocol/bgp/flowspec/RIBActivator.java | 8 ++-- ...impleFlowspecExtensionProviderContext.java | 8 ++-- .../AbstractFlowspecL3vpnRIBSupport.java | 2 +- .../FlowspecL3vpnIpv4NlriParserTest.java | 48 +++++++++---------- .../FlowspecL3vpnIpv6NlriParserTest.java | 40 ++++++++-------- .../SimpleFlowspecIpv4NlriParserTest.java | 46 +++++++++--------- .../SimpleFlowspecIpv6NlriParserTest.java | 40 ++++++++-------- .../FSExtendedCommunitiesTest.java | 16 +++---- .../nexthop/NextHopParserSerializerTest.java | 38 +++++++-------- .../AbstractVpnNextHopParserSerializer.java | 6 +-- .../bgp/labeled/unicast/LUNlriParserTest.java | 2 +- .../bgp/linkstate/impl/BGPActivator.java | 2 +- .../ExtendedCommunitiesAttributeParser.java | 2 +- .../bgp/parser/impl/CommunityTest.java | 12 ++--- .../spi/pojo/AbstractFamilyRegistry.java | 16 +++---- ...eBGPExtensionProviderContextActivator.java | 10 ++-- .../pojo/SimpleExtendedCommunityRegistry.java | 4 +- .../SimpleExtendedCommunityRegistryTest.java | 34 ++++++------- .../protocol/bgp/mode/impl/add/OffsetMap.java | 6 +-- .../n/paths/AddPathBestNPathSelection.java | 2 +- .../bgp/mode/impl/base/OffsetMap.java | 6 +-- .../mode/AdvertiseAllPathsModuleTest.java | 2 +- .../mode/AdvertiseNPathsModuleTest.java | 2 +- .../bgp/mode/impl/AbstractRouteEntryTest.java | 18 +++---- .../protocol/bgp/rib/DefaultRibReference.java | 2 +- .../bgp/rib/impl/BGPDispatcherImplModule.java | 2 +- .../impl/AbstractReflectingExportPolicy.java | 2 +- .../bgp/rib/impl/CachingImportPolicy.java | 8 ++-- .../rib/impl/ExportPolicyPeerTrackerImpl.java | 10 ++-- .../bgp/rib/impl/PeerExportGroupImpl.java | 4 +- .../protocol/bgp/rib/impl/PolicyDatabase.java | 2 +- .../protocol/bgp/rib/impl/RouteUpdateKey.java | 12 ++--- .../bgp/rib/impl/ToExternalExportPolicy.java | 2 +- .../bgp/rib/spi/RIBExtensionsImplModule.java | 2 +- .../bgp/rib/spi/AbstractRIBSupport.java | 4 +- .../bgp/rib/spi/BGPTerminationReason.java | 4 +- .../protocol/bgp/rib/spi/PeerExportGroup.java | 4 +- ...viceLoaderRIBExtensionConsumerContext.java | 2 +- ...eRIBExtensionProviderContextActivator.java | 10 ++-- .../bgp/rib/spi/RibSupportUtilsTest.java | 10 ++-- .../protocol/bgp/rib/spi/RouterIdsTest.java | 8 ++-- .../concepts/AbstractRegistration.java | 4 +- .../concepts/DefaultInstanceReference.java | 2 +- .../pcep/AbstractPcepOsgiTest.java | 6 +-- .../pcep/PcepRpcServicesRoutingTest.java | 18 +++---- .../pcep/impl/PCEPDispatcherImplModule.java | 2 +- .../impl/AbstractPCEPSessionNegotiator.java | 2 +- .../pcep/impl/PCEPHandlerFactory.java | 2 +- .../pcep/impl/AbstractPCEPSessionTest.java | 4 +- .../pcep/impl/PCEPSessionImplTest.java | 6 +-- .../protocol/pcep/impl/PCEPValidatorTest.java | 2 +- .../impl/TestVendorInformationTlvParser.java | 6 +-- .../pcep/pcc/mock/PCCSyncOptimization.java | 12 ++--- .../protocol/pcep/pcc/mock/PCCsBuilder.java | 6 +-- .../protocol/pcep/pcc/mock/TimerHandler.java | 16 +++---- .../mock/protocol/PCCServerPeerProposal.java | 4 +- .../segment/routing/SrEroSubobjectParser.java | 2 +- .../segment/routing/SrRroSubobjectParser.java | 2 +- .../routing/SrEroSubobjectParserTest.java | 34 ++++++------- .../routing/SrRroSubobjectParserTest.java | 32 ++++++------- ...PCEPExtensionProviderContextActivator.java | 10 ++-- .../AbstractTopologySessionListener.java | 42 ++++++++-------- .../topology/provider/OperationResults.java | 4 +- .../pcep/topology/provider/PCEPRequest.java | 26 +++++----- .../Stateful07TopologySessionListener.java | 14 +++--- .../topology/provider/SyncOptimization.java | 12 ++--- .../topology/provider/TopologyNodeState.java | 44 ++++++++--------- .../provider/TopologyProgramming.java | 10 ++-- .../pcep/topology/provider/TopologyRPCs.java | 10 ++-- .../provider/PCEPTunnelTopologyProvider.java | 4 +- .../rsvp/parser/impl/te/TEObjectTest.java | 18 +++---- ...RSVPExtensionProviderContextActivator.java | 10 ++-- .../spi/pojo/SimpleLabelRegistryTest.java | 6 +-- 86 files changed, 445 insertions(+), 445 deletions(-) diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/controller/config/yang/bmp/impl/BmpDispatcherImplModule.java b/bgp/bmp-impl/src/main/java/org/opendaylight/controller/config/yang/bmp/impl/BmpDispatcherImplModule.java index 85c0ab2af4..634c4021ea 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/controller/config/yang/bmp/impl/BmpDispatcherImplModule.java +++ b/bgp/bmp-impl/src/main/java/org/opendaylight/controller/config/yang/bmp/impl/BmpDispatcherImplModule.java @@ -41,7 +41,7 @@ public class BmpDispatcherImplModule extends AbstractBmpDispatcherImplModule { // The BmpDispatcher instance is created and advertised as an OSGi service via blueprint // so obtain it here (waiting if necessary). final WaitingServiceTracker tracker = - WaitingServiceTracker.create(BmpDispatcher.class, bundleContext); + WaitingServiceTracker.create(BmpDispatcher.class, this.bundleContext); final BmpDispatcher service = tracker.waitForService(WaitingServiceTracker.FIVE_MINUTES); // Create a proxy to override close to close the ServiceTracker. The actual BmpDispatcher diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterImpl.java b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterImpl.java index 6008ecc411..4bf05fc35f 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterImpl.java +++ b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterImpl.java @@ -94,7 +94,7 @@ public class BmpRouterImpl implements BmpRouter, TransactionChainListener { } else { this.routerYangIId = YangInstanceIdentifier.builder(this.sessionManager.getRoutersYangIId()).nodeWithKey(Router.QNAME, ROUTER_ID_QNAME, this.routerIp).build(); - this.peersYangIId = YangInstanceIdentifier.builder(routerYangIId).node(Peer.QNAME).build(); + this.peersYangIId = YangInstanceIdentifier.builder(this.routerYangIId).node(Peer.QNAME).build(); createRouterEntry(); LOG.info("BMP session with remote router {} ({}) is up now.", this.routerIp, this.session); } @@ -120,7 +120,7 @@ public class BmpRouterImpl implements BmpRouter, TransactionChainListener { @Override public RouterId getRouterId() { - return routerId; + return this.routerId; } @Override @@ -192,7 +192,7 @@ public class BmpRouterImpl implements BmpRouter, TransactionChainListener { wTx.put(LogicalDatastoreType.OPERATIONAL, this.routerYangIId, Builders.mapEntryBuilder() .withNodeIdentifier(new NodeIdentifierWithPredicates(Router.QNAME, ROUTER_ID_QNAME, this.routerIp)) - .withChild(ImmutableNodes.leafNode(ROUTER_ID_QNAME, routerIp)) + .withChild(ImmutableNodes.leafNode(ROUTER_ID_QNAME, this.routerIp)) .withChild(ImmutableNodes.leafNode(ROUTER_STATUS_QNAME, DOWN)) .withChild(ImmutableNodes.mapNodeBuilder(Peer.QNAME).build()).build()); wTx.submit(); diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/RouterSessionManager.java b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/RouterSessionManager.java index 900609fd63..90eca5e641 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/RouterSessionManager.java +++ b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/RouterSessionManager.java @@ -49,7 +49,7 @@ final class RouterSessionManager implements BmpSessionListenerFactory, AutoClose private synchronized boolean isSessionExist(final BmpRouter sessionListener) { Preconditions.checkNotNull(sessionListener); - return sessionListeners.containsKey(Preconditions.checkNotNull(sessionListener.getRouterId())); + return this.sessionListeners.containsKey(Preconditions.checkNotNull(sessionListener.getRouterId())); } synchronized boolean addSessionListener(final BmpRouter sessionListener) { @@ -85,7 +85,7 @@ final class RouterSessionManager implements BmpSessionListenerFactory, AutoClose } RIBExtensionConsumerContext getExtensions() { - return extensions; + return this.extensions; } BindingCodecTree getCodecTree() { diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TableContext.java b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TableContext.java index 2c7a80c923..8ccb818857 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TableContext.java +++ b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TableContext.java @@ -87,11 +87,11 @@ final class TableContext { void createTable(final DOMDataWriteTransaction tx) { final DataContainerNodeBuilder tb = ImmutableNodes.mapEntryBuilder(); - tb.withNodeIdentifier((YangInstanceIdentifier.NodeIdentifierWithPredicates)tableId.getLastPathArgument()); + tb.withNodeIdentifier((YangInstanceIdentifier.NodeIdentifierWithPredicates) this.tableId.getLastPathArgument()); tb.withChild(EMPTY_TABLE_ATTRIBUTES); // tableId is keyed, but that fact is not directly visible from YangInstanceIdentifier, see BUG-2796 - final YangInstanceIdentifier.NodeIdentifierWithPredicates tableKey = (YangInstanceIdentifier.NodeIdentifierWithPredicates) tableId.getLastPathArgument(); + final YangInstanceIdentifier.NodeIdentifierWithPredicates tableKey = (YangInstanceIdentifier.NodeIdentifierWithPredicates) this.tableId.getLastPathArgument(); for (final Map.Entry e : tableKey.getKeyValues().entrySet()) { tb.withChild(ImmutableNodes.leafNode(e.getKey(), e.getValue())); } diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/session/BmpSessionImpl.java b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/session/BmpSessionImpl.java index 652be4b4fb..c4655f0cc7 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/session/BmpSessionImpl.java +++ b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/session/BmpSessionImpl.java @@ -63,7 +63,7 @@ public final class BmpSessionImpl extends SimpleChannelInboundHandler {}.", channel.localAddress(), channel.remoteAddress()); + LOG.info("Starting session {} <-> {}.", this.channel.localAddress(), this.channel.remoteAddress()); sessionUp(); } @@ -140,7 +140,7 @@ public final class BmpSessionImpl extends SimpleChannelInboundHandler serviceInterface, final Object instance) throws Exception { final ServiceReference mockServiceRef = mock(ServiceReference.class); - doReturn(new ServiceReference[]{mockServiceRef}).when(mockedContext). + doReturn(new ServiceReference[]{mockServiceRef}).when(this.mockedContext). getServiceReferences(anyString(), contains(serviceInterface.getName())); - doReturn(new ServiceReference[]{mockServiceRef}).when(mockedContext). + doReturn(new ServiceReference[]{mockServiceRef}).when(this.mockedContext). getServiceReferences(serviceInterface.getName(), null); - doReturn(instance).when(mockedContext).getService(mockServiceRef); + doReturn(instance).when(this.mockedContext).getService(mockServiceRef); } } diff --git a/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/session/BmpTestSessionListener.java b/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/session/BmpTestSessionListener.java index 34d8501c8e..25c1658015 100644 --- a/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/session/BmpTestSessionListener.java +++ b/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/session/BmpTestSessionListener.java @@ -26,7 +26,7 @@ public class BmpTestSessionListener implements BmpSessionListener { private boolean up = false; public boolean isUp () { - return up; + return this.up; } public List getListMsg() { diff --git a/bgp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockDispatcher.java b/bgp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockDispatcher.java index 47da129062..a3d819cbf5 100644 --- a/bgp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockDispatcher.java +++ b/bgp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockDispatcher.java @@ -91,7 +91,7 @@ final class BmpMockDispatcher { serverBootstrap.option(ChannelOption.SO_BACKLOG, MAX_CONNECTIONS_COUNT); serverBootstrap.childOption(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT); serverBootstrap.channel(NioServerSocketChannel.class); - serverBootstrap.group(bossGroup, workerGroup); + serverBootstrap.group(this.bossGroup, this.workerGroup); return serverBootstrap; } diff --git a/bgp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockSessionTest.java b/bgp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockSessionTest.java index e25d0666e4..62c311fada 100644 --- a/bgp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockSessionTest.java +++ b/bgp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockSessionTest.java @@ -68,10 +68,10 @@ public class BmpMockSessionTest { this.session.channelActive(this.context); assertEquals(REMOTE_ADDRESS.getAddress(), this.session.getRemoteAddress()); - assertTrue(messages.get(0) instanceof InitiationMessage); - assertTrue(messages.get(1) instanceof PeerUp); - assertTrue(messages.get(2) instanceof RouteMonitoringMessage); - assertTrue(messages.get(3) instanceof RouteMonitoringMessage); + assertTrue(this.messages.get(0) instanceof InitiationMessage); + assertTrue(this.messages.get(1) instanceof PeerUp); + assertTrue(this.messages.get(2) instanceof RouteMonitoringMessage); + assertTrue(this.messages.get(3) instanceof RouteMonitoringMessage); this.session.close(); assertFalse(this.channel.isWritable()); diff --git a/bgp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockTest.java b/bgp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockTest.java index 031111e3e0..7b1d873ae8 100644 --- a/bgp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockTest.java +++ b/bgp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockTest.java @@ -60,7 +60,7 @@ public class BmpMockTest { public void testMain() throws Exception { final InetSocketAddress serverAddr = InetSocketAddressUtil.getRandomLoopbackInetSocketAddress(); final BmpSessionListenerFactory bmpSessionListenerFactory = () -> BmpMockTest.this.sessionListener; - final ChannelFuture futureServer = bmpDispatcher.createServer(serverAddr, + final ChannelFuture futureServer = this.bmpDispatcher.createServer(serverAddr, bmpSessionListenerFactory, Optional.absent()); waitFutureComplete(futureServer); Channel serverChannel; @@ -93,7 +93,7 @@ public class BmpMockTest { // create a local server in passive mode instead BmpMock.main(new String[]{"--local_address", InetSocketAddressUtil.toHostAndPort(serverAddr).toString(), "--peers_count", "3", "--pre_policy_routes", "3", "--passive"}); - final ChannelFuture futureServer = bmpDispatcher.createClient(serverAddr, + final ChannelFuture futureServer = this.bmpDispatcher.createClient(serverAddr, bmpSessionListenerFactory, Optional.absent()); waitFutureComplete(futureServer); Channel serverChannel; diff --git a/bgp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/registry/SimpleBmpExtensionProviderContextActivator.java b/bgp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/registry/SimpleBmpExtensionProviderContextActivator.java index 0c874ff9d8..4930a971d6 100644 --- a/bgp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/registry/SimpleBmpExtensionProviderContextActivator.java +++ b/bgp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/registry/SimpleBmpExtensionProviderContextActivator.java @@ -30,18 +30,18 @@ public class SimpleBmpExtensionProviderContextActivator implements AutoCloseable } public void start() { - LOG.debug("Starting {} BmpExtensionProviderActivator instances", extensionActivators.size()); + LOG.debug("Starting {} BmpExtensionProviderActivator instances", this.extensionActivators.size()); - for(final BmpExtensionProviderActivator e : extensionActivators) { - e.start(providerContext); + for(final BmpExtensionProviderActivator e : this.extensionActivators) { + e.start(this.providerContext); } } @Override public void close() { - LOG.debug("Stopping {} BmpExtensionProviderActivator instances", extensionActivators.size()); + LOG.debug("Stopping {} BmpExtensionProviderActivator instances", this.extensionActivators.size()); - for(final BmpExtensionProviderActivator e : extensionActivators) { + for(final BmpExtensionProviderActivator e : this.extensionActivators) { e.stop(); } } diff --git a/bgp/concepts/src/main/java/org/opendaylight/bgp/concepts/RouteDistinguisherUtil.java b/bgp/concepts/src/main/java/org/opendaylight/bgp/concepts/RouteDistinguisherUtil.java index 1b9c041ae6..74c60175aa 100644 --- a/bgp/concepts/src/main/java/org/opendaylight/bgp/concepts/RouteDistinguisherUtil.java +++ b/bgp/concepts/src/main/java/org/opendaylight/bgp/concepts/RouteDistinguisherUtil.java @@ -40,7 +40,7 @@ public final class RouteDistinguisherUtil { public final int value; RD_TYPE(int val) { - value = val; + this.value = val; } public static RD_TYPE valueOf(final int value) { diff --git a/bgp/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/attributes/tunnel/identifier/TunnelType.java b/bgp/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/attributes/tunnel/identifier/TunnelType.java index ee6c62f6ea..0bd6f6ad2f 100644 --- a/bgp/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/attributes/tunnel/identifier/TunnelType.java +++ b/bgp/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/attributes/tunnel/identifier/TunnelType.java @@ -36,10 +36,10 @@ enum TunnelType { } public Class getClazz() { - return clazz; + return this.clazz; } public int getIntValue() { - return value; + return this.value; } } diff --git a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/RIBActivator.java b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/RIBActivator.java index f74da66854..a35fef1792 100644 --- a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/RIBActivator.java +++ b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/RIBActivator.java @@ -30,10 +30,10 @@ public final class RIBActivator extends AbstractRIBExtensionProviderActivator { @Override protected List startRIBExtensionProviderImpl(final RIBExtensionProviderContext context) { final List regs = new ArrayList<>(); - regs.add(context.registerRIBSupport(Ipv4AddressFamily.class, FlowspecSubsequentAddressFamily.class, FlowspecIpv4RIBSupport.getInstance(fsContext))); - regs.add(context.registerRIBSupport(Ipv6AddressFamily.class, FlowspecSubsequentAddressFamily.class, FlowspecIpv6RIBSupport.getInstance(fsContext))); - regs.add(context.registerRIBSupport(Ipv4AddressFamily.class, FlowspecL3vpnSubsequentAddressFamily.class, FlowspecL3vpnIpv4RIBSupport.getInstance(fsContext))); - regs.add(context.registerRIBSupport(Ipv6AddressFamily.class, FlowspecL3vpnSubsequentAddressFamily.class, FlowspecL3vpnIpv6RIBSupport.getInstance(fsContext))); + regs.add(context.registerRIBSupport(Ipv4AddressFamily.class, FlowspecSubsequentAddressFamily.class, FlowspecIpv4RIBSupport.getInstance(this.fsContext))); + regs.add(context.registerRIBSupport(Ipv6AddressFamily.class, FlowspecSubsequentAddressFamily.class, FlowspecIpv6RIBSupport.getInstance(this.fsContext))); + regs.add(context.registerRIBSupport(Ipv4AddressFamily.class, FlowspecL3vpnSubsequentAddressFamily.class, FlowspecL3vpnIpv4RIBSupport.getInstance(this.fsContext))); + regs.add(context.registerRIBSupport(Ipv6AddressFamily.class, FlowspecL3vpnSubsequentAddressFamily.class, FlowspecL3vpnIpv6RIBSupport.getInstance(this.fsContext))); return regs; } } diff --git a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecExtensionProviderContext.java b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecExtensionProviderContext.java index ed36a9f80f..e26da225c7 100644 --- a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecExtensionProviderContext.java +++ b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecExtensionProviderContext.java @@ -15,7 +15,7 @@ public class SimpleFlowspecExtensionProviderContext { public final int index; AFI(int i) { - index = i; + this.index = i; } } @@ -26,7 +26,7 @@ public class SimpleFlowspecExtensionProviderContext { public final int index; SAFI(int i) { - index = i; + this.index = i; } } @@ -35,12 +35,12 @@ public class SimpleFlowspecExtensionProviderContext { public SimpleFlowspecExtensionProviderContext() { for (AFI afi : AFI.values()) { for (SAFI safi : SAFI.values()) { - flowspecTypeRegistries[afi.index][safi.index] = new SimpleFlowspecTypeRegistry(); + this.flowspecTypeRegistries[afi.index][safi.index] = new SimpleFlowspecTypeRegistry(); } } } public SimpleFlowspecTypeRegistry getFlowspecTypeRegistry(AFI afi, SAFI safi) { - return flowspecTypeRegistries[afi.index][safi.index]; + return this.flowspecTypeRegistries[afi.index][safi.index]; } } diff --git a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/l3vpn/AbstractFlowspecL3vpnRIBSupport.java b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/l3vpn/AbstractFlowspecL3vpnRIBSupport.java index d1fc2f724f..8ffc827fe8 100644 --- a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/l3vpn/AbstractFlowspecL3vpnRIBSupport.java +++ b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/l3vpn/AbstractFlowspecL3vpnRIBSupport.java @@ -61,7 +61,7 @@ public abstract class AbstractFlowspecL3vpnRIBSupport expected = new ArrayList<>(); expected.add(expectedFS.build()); - assertEquals(expected, FS_PARSER.extractFlowspec(entry.build())); + assertEquals(expected, this.FS_PARSER.extractFlowspec(entry.build())); } @Test @@ -555,7 +555,7 @@ public class FlowspecL3vpnIpv4NlriParserTest { expectedFS.setFlowspecType(new SourcePrefixCaseBuilder().setSourcePrefix(new Ipv4Prefix("127.0.0.6/32")).build()); final List expected = new ArrayList<>(); expected.add(expectedFS.build()); - assertEquals(expected, FS_PARSER.extractFlowspec(entry.build())); + assertEquals(expected, this.FS_PARSER.extractFlowspec(entry.build())); } @Test @@ -587,7 +587,7 @@ public class FlowspecL3vpnIpv4NlriParserTest { new ProtocolIpsBuilder().setValue((short) 240).setOp(new NumericOperand(true, true, true, false, false)).build())).build()); final List expected = new ArrayList<>(); expected.add(expectedFS.build()); - assertEquals(expected, FS_PARSER.extractFlowspec(entry.build())); + assertEquals(expected, this.FS_PARSER.extractFlowspec(entry.build())); } @Test @@ -610,7 +610,7 @@ public class FlowspecL3vpnIpv4NlriParserTest { expectedFS.setFlowspecType(new PortCaseBuilder().setPorts(Lists.newArrayList(new PortsBuilder().setValue(100).setOp(new NumericOperand(true, true, false, false, true)).build())).build()); final List expected = new ArrayList<>(); expected.add(expectedFS.build()); - assertEquals(expected, FS_PARSER.extractFlowspec(entry.build())); + assertEquals(expected, this.FS_PARSER.extractFlowspec(entry.build())); } @Test @@ -632,7 +632,7 @@ public class FlowspecL3vpnIpv4NlriParserTest { expectedFS.setFlowspecType(new DestinationPortCaseBuilder().setDestinationPorts(Lists.newArrayList(new DestinationPortsBuilder().setValue(1024).setOp(new NumericOperand(false, true, true, false, false)).build())).build()); final List expected = new ArrayList<>(); expected.add(expectedFS.build()); - assertEquals(expected, FS_PARSER.extractFlowspec(entry.build())); + assertEquals(expected, this.FS_PARSER.extractFlowspec(entry.build())); } @Test @@ -654,7 +654,7 @@ public class FlowspecL3vpnIpv4NlriParserTest { expectedFS.setFlowspecType(new SourcePortCaseBuilder().setSourcePorts(Lists.newArrayList(new SourcePortsBuilder().setValue(8080).setOp(new NumericOperand(true, true, true, true, true)).build())).build()); final List expected = new ArrayList<>(); expected.add(expectedFS.build()); - assertEquals(expected, FS_PARSER.extractFlowspec(entry.build())); + assertEquals(expected, this.FS_PARSER.extractFlowspec(entry.build())); } @Test @@ -676,7 +676,7 @@ public class FlowspecL3vpnIpv4NlriParserTest { expectedFS.setFlowspecType(new IcmpTypeCaseBuilder().setTypes(Lists.newArrayList(new TypesBuilder().setValue((short) 22).setOp(new NumericOperand(true, true, true, true, true)).build())).build()); final List expected = new ArrayList<>(); expected.add(expectedFS.build()); - assertEquals(expected, FS_PARSER.extractFlowspec(entry.build())); + assertEquals(expected, this.FS_PARSER.extractFlowspec(entry.build())); } @Test @@ -698,7 +698,7 @@ public class FlowspecL3vpnIpv4NlriParserTest { expectedFS.setFlowspecType(new IcmpCodeCaseBuilder().setCodes(Lists.newArrayList(new CodesBuilder().setValue((short) 23).setOp(new NumericOperand(false, false, false, false, false)).build())).build()); final List expected = new ArrayList<>(); expected.add(expectedFS.build()); - assertEquals(expected, FS_PARSER.extractFlowspec(entry.build())); + assertEquals(expected, this.FS_PARSER.extractFlowspec(entry.build())); } @Test @@ -720,7 +720,7 @@ public class FlowspecL3vpnIpv4NlriParserTest { expectedFS.setFlowspecType(new TcpFlagsCaseBuilder().setTcpFlags(Lists.newArrayList(new TcpFlagsBuilder().setValue(99).setOp(new BitmaskOperand(true, true, false, false)).build())).build()); final List expected = new ArrayList<>(); expected.add(expectedFS.build()); - assertEquals(expected, FS_PARSER.extractFlowspec(entry.build())); + assertEquals(expected, this.FS_PARSER.extractFlowspec(entry.build())); } @Test @@ -742,7 +742,7 @@ public class FlowspecL3vpnIpv4NlriParserTest { expectedFS.setFlowspecType(new PacketLengthCaseBuilder().setPacketLengths(Lists.newArrayList(new PacketLengthsBuilder().setValue(101).setOp(new NumericOperand(true, false, false, true, false)).build())).build()); final List expected = new ArrayList<>(); expected.add(expectedFS.build()); - assertEquals(expected, FS_PARSER.extractFlowspec(entry.build())); + assertEquals(expected, this.FS_PARSER.extractFlowspec(entry.build())); } @Test @@ -764,7 +764,7 @@ public class FlowspecL3vpnIpv4NlriParserTest { expectedFS.setFlowspecType(new DscpCaseBuilder().setDscps(Lists.newArrayList(new DscpsBuilder().setValue(new Dscp((short) 15)).setOp(new NumericOperand(true, true, false, true, false)).build())).build()); final List expected = new ArrayList<>(); expected.add(expectedFS.build()); - assertEquals(expected, FS_PARSER.extractFlowspec(entry.build())); + assertEquals(expected, this.FS_PARSER.extractFlowspec(entry.build())); } @Test @@ -786,7 +786,7 @@ public class FlowspecL3vpnIpv4NlriParserTest { expectedFS.setFlowspecType(new FragmentCaseBuilder().setFragments(Lists.newArrayList(new FragmentsBuilder().setValue(new Fragment(true, true, true, true)).setOp(new BitmaskOperand(true, true, true, true)).build())).build()); final List expected = new ArrayList<>(); expected.add(expectedFS.build()); - assertEquals(expected, FS_PARSER.extractFlowspec(entry.build())); + assertEquals(expected, this.FS_PARSER.extractFlowspec(entry.build())); } @Test @@ -802,7 +802,7 @@ public class FlowspecL3vpnIpv4NlriParserTest { ); RouteDistinguisher rd = RouteDistinguisherBuilder.getDefaultInstance(ROUTE_DISTINGUISHER); - assertEquals(rd, extractRouteDistinguisher(entry.build(), FS_PARSER.RD_NID)); + assertEquals(rd, extractRouteDistinguisher(entry.build(), this.FS_PARSER.RD_NID)); } } diff --git a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv6NlriParserTest.java b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv6NlriParserTest.java index c8c0fda3aa..3325f06388 100644 --- a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv6NlriParserTest.java +++ b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv6NlriParserTest.java @@ -84,8 +84,8 @@ public class FlowspecL3vpnIpv6NlriParserTest { @Mock private MultiPathSupport muliPathSupport; private final SimpleFlowspecExtensionProviderContext flowspecContext = new SimpleFlowspecExtensionProviderContext(); - private final FlowspecActivator fsa = new FlowspecActivator(flowspecContext); - private final FlowspecL3vpnIpv6NlriParser FS_PARSER = new FlowspecL3vpnIpv6NlriParser(flowspecContext.getFlowspecTypeRegistry(SimpleFlowspecExtensionProviderContext.AFI.IPV6, SimpleFlowspecExtensionProviderContext.SAFI.FLOWSPEC)); + private final FlowspecActivator fsa = new FlowspecActivator(this.flowspecContext); + private final FlowspecL3vpnIpv6NlriParser FS_PARSER = new FlowspecL3vpnIpv6NlriParser(this.flowspecContext.getFlowspecTypeRegistry(SimpleFlowspecExtensionProviderContext.AFI.IPV6, SimpleFlowspecExtensionProviderContext.SAFI.FLOWSPEC)); private static final byte[] REACHED_NLRI = new byte[]{ 0x1B, // NLRI length: 19+8=27 @@ -120,7 +120,7 @@ public class FlowspecL3vpnIpv6NlriParserTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - Mockito.doReturn(Optional.of(this.muliPathSupport)).when(constraint).getPeerConstraint(Mockito.any()); + Mockito.doReturn(Optional.of(this.muliPathSupport)).when(this.constraint).getPeerConstraint(Mockito.any()); Mockito.doReturn(true).when(this.muliPathSupport).isTableTypeSupported(Mockito.any()); } @@ -146,7 +146,7 @@ public class FlowspecL3vpnIpv6NlriParserTest { final MpReachNlriBuilder result = new MpReachNlriBuilder(); result.setAfi(Ipv6AddressFamily.class); result.setSafi(FlowspecL3vpnSubsequentAddressFamily.class); - FS_PARSER.parseNlri(Unpooled.wrappedBuffer(REACHED_NLRI), result); + this.FS_PARSER.parseNlri(Unpooled.wrappedBuffer(REACHED_NLRI), result); DestinationFlowspecL3vpnIpv6 flowspecDst = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.reach.nlri.advertized.routes.destination.type.DestinationFlowspecL3vpnIpv6Case) (result.getAdvertizedRoutes().getDestinationType())) .getDestinationFlowspecL3vpnIpv6(); @@ -173,10 +173,10 @@ public class FlowspecL3vpnIpv6NlriParserTest { ); final ByteBuf buffer = Unpooled.buffer(); - FS_PARSER.serializeAttribute(new AttributesBuilder().addAugmentation(Attributes1.class, new Attributes1Builder().setMpReachNlri(mp.setAfi(Ipv6AddressFamily.class).build()).build()).build(), buffer); + this.FS_PARSER.serializeAttribute(new AttributesBuilder().addAugmentation(Attributes1.class, new Attributes1Builder().setMpReachNlri(mp.setAfi(Ipv6AddressFamily.class).build()).build()).build(), buffer); assertArrayEquals(REACHED_NLRI, ByteArray.readAllBytes(buffer)); - assertEquals("all packets to 102:304:500::/40 AND from 102:304:600::/40 AND where next header equals to 6 ", FS_PARSER.stringNlri(flows)); + assertEquals("all packets to 102:304:500::/40 AND from 102:304:600::/40 AND where next header equals to 6 ", this.FS_PARSER.stringNlri(flows)); } @Test @@ -201,7 +201,7 @@ public class FlowspecL3vpnIpv6NlriParserTest { final MpReachNlriBuilder result = new MpReachNlriBuilder(); result.setAfi(Ipv6AddressFamily.class); result.setSafi(FlowspecL3vpnSubsequentAddressFamily.class); - FS_PARSER.parseNlri(Unpooled.wrappedBuffer(REACHED_NLRI_ADD_PATH), result, this.constraint); + this.FS_PARSER.parseNlri(Unpooled.wrappedBuffer(REACHED_NLRI_ADD_PATH), result, this.constraint); final DestinationFlowspecL3vpnIpv6 flowspecDst = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.reach.nlri.advertized.routes.destination.type.DestinationFlowspecL3vpnIpv6Case) (result.getAdvertizedRoutes().getDestinationType())) .getDestinationFlowspecL3vpnIpv6(); @@ -227,10 +227,10 @@ public class FlowspecL3vpnIpv6NlriParserTest { ); final ByteBuf buffer = Unpooled.buffer(); - FS_PARSER.serializeAttribute(new AttributesBuilder().addAugmentation(Attributes1.class, new Attributes1Builder().setMpReachNlri(mp.setAfi(Ipv6AddressFamily.class).build()).build()).build(), buffer); + this.FS_PARSER.serializeAttribute(new AttributesBuilder().addAugmentation(Attributes1.class, new Attributes1Builder().setMpReachNlri(mp.setAfi(Ipv6AddressFamily.class).build()).build()).build(), buffer); assertArrayEquals(REACHED_NLRI_ADD_PATH, ByteArray.readAllBytes(buffer)); - assertEquals("all packets to 102:304:500::/40 AND from 102:304:600::/40 AND where next header equals to 6 ", FS_PARSER.stringNlri(flows)); + assertEquals("all packets to 102:304:500::/40 AND from 102:304:600::/40 AND where next header equals to 6 ", this.FS_PARSER.stringNlri(flows)); } @Test @@ -251,7 +251,7 @@ public class FlowspecL3vpnIpv6NlriParserTest { final MpUnreachNlriBuilder result = new MpUnreachNlriBuilder(); result.setAfi(Ipv6AddressFamily.class); result.setSafi(FlowspecL3vpnSubsequentAddressFamily.class); - FS_PARSER.parseNlri(Unpooled.wrappedBuffer(UNREACHED_NLRI), result); + this.FS_PARSER.parseNlri(Unpooled.wrappedBuffer(UNREACHED_NLRI), result); final DestinationFlowspecL3vpnIpv6 flowspecDst = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationFlowspecL3vpnIpv6Case) (result.getWithdrawnRoutes().getDestinationType())) .getDestinationFlowspecL3vpnIpv6(); @@ -275,11 +275,11 @@ public class FlowspecL3vpnIpv6NlriParserTest { ); final ByteBuf buffer = Unpooled.buffer(); - FS_PARSER.serializeAttribute(new AttributesBuilder().addAugmentation(Attributes2.class, new Attributes2Builder().setMpUnreachNlri(mp.build()).build()).build(), buffer); + this.FS_PARSER.serializeAttribute(new AttributesBuilder().addAugmentation(Attributes2.class, new Attributes2Builder().setMpUnreachNlri(mp.build()).build()).build(), buffer); assertArrayEquals(UNREACHED_NLRI, ByteArray.readAllBytes(buffer)); - assertEquals("all packets where fragment does match 'IS FIRST' 'IS LAST' 'IS A' AND where flow label equals to 16777222 or equals to 258 ", FS_PARSER.stringNlri(flows)); + assertEquals("all packets where fragment does match 'IS FIRST' 'IS LAST' 'IS A' AND where flow label equals to 16777222 or equals to 258 ", this.FS_PARSER.stringNlri(flows)); } private FragmentCase createFragment() { @@ -312,7 +312,7 @@ public class FlowspecL3vpnIpv6NlriParserTest { final MpUnreachNlriBuilder result = new MpUnreachNlriBuilder(); result.setAfi(Ipv6AddressFamily.class); result.setSafi(FlowspecL3vpnSubsequentAddressFamily.class); - FS_PARSER.parseNlri(Unpooled.wrappedBuffer(UNREACHED_NLRI_ADD_PATH), result, this.constraint); + this.FS_PARSER.parseNlri(Unpooled.wrappedBuffer(UNREACHED_NLRI_ADD_PATH), result, this.constraint); final DestinationFlowspecL3vpnIpv6 flowspecDst = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationFlowspecL3vpnIpv6Case) (result.getWithdrawnRoutes().getDestinationType())) .getDestinationFlowspecL3vpnIpv6(); @@ -337,11 +337,11 @@ public class FlowspecL3vpnIpv6NlriParserTest { ); final ByteBuf buffer = Unpooled.buffer(); - FS_PARSER.serializeAttribute(new AttributesBuilder().addAugmentation(Attributes2.class, new Attributes2Builder().setMpUnreachNlri(mp.build()).build()).build(), buffer); + this.FS_PARSER.serializeAttribute(new AttributesBuilder().addAugmentation(Attributes2.class, new Attributes2Builder().setMpUnreachNlri(mp.build()).build()).build(), buffer); assertArrayEquals(UNREACHED_NLRI_ADD_PATH, ByteArray.readAllBytes(buffer)); - assertEquals("all packets where fragment does match 'IS FIRST' 'IS LAST' 'IS A' AND where flow label equals to 16777222 or equals to 258 ", FS_PARSER.stringNlri(flows)); + assertEquals("all packets where fragment does match 'IS FIRST' 'IS LAST' 'IS A' AND where flow label equals to 16777222 or equals to 258 ", this.FS_PARSER.stringNlri(flows)); } @Test @@ -363,7 +363,7 @@ public class FlowspecL3vpnIpv6NlriParserTest { expectedFS.setFlowspecType(new FragmentCaseBuilder().setFragments(Lists.newArrayList(new FragmentsBuilder().setValue(new Fragment(true, true, true, true)).setOp(new BitmaskOperand(true, true, true, true)).build())).build()); final List expectedValue = new ArrayList<>(); expectedValue.add(expectedFS.build()); - assertEquals(expectedValue, FS_PARSER.extractFlowspec(entry.build())); + assertEquals(expectedValue, this.FS_PARSER.extractFlowspec(entry.build())); } @Test @@ -395,7 +395,7 @@ public class FlowspecL3vpnIpv6NlriParserTest { new NextHeadersBuilder().setValue((short) 210).setOp(new NumericOperand(true, true, true, false, false)).build())).build()); final List expectedValue = new ArrayList<>(); expectedValue.add(expectedFS.build()); - assertEquals(expectedValue, FS_PARSER.extractFlowspec(entry.build())); + assertEquals(expectedValue, this.FS_PARSER.extractFlowspec(entry.build())); } @Test @@ -423,7 +423,7 @@ public class FlowspecL3vpnIpv6NlriParserTest { new FlowLabelBuilder().setValue(200L).setOp(new NumericOperand(true, false, false, false, false)).build())).build()); final List expectedValue = new ArrayList<>(); expectedValue.add(expectedFS.build()); - assertEquals(expectedValue, FS_PARSER.extractFlowspec(entry.build())); + assertEquals(expectedValue, this.FS_PARSER.extractFlowspec(entry.build())); } @Test @@ -441,7 +441,7 @@ public class FlowspecL3vpnIpv6NlriParserTest { expectedFS.setFlowspecType(new DestinationIpv6PrefixCaseBuilder().setDestinationPrefix(new Ipv6Prefix("102:304:500::/40")).build()); final List expectedValue = new ArrayList<>(); expectedValue.add(expectedFS.build()); - assertEquals(expectedValue, FS_PARSER.extractFlowspec(entry.build())); + assertEquals(expectedValue, this.FS_PARSER.extractFlowspec(entry.build())); } @Test @@ -459,7 +459,7 @@ public class FlowspecL3vpnIpv6NlriParserTest { expectedFS.setFlowspecType(new SourceIpv6PrefixCaseBuilder().setSourcePrefix(new Ipv6Prefix("102:304:600::/40")).build()); final List expectedValue = new ArrayList<>(); expectedValue.add(expectedFS.build()); - assertEquals(expectedValue, FS_PARSER.extractFlowspec(entry.build())); + assertEquals(expectedValue, this.FS_PARSER.extractFlowspec(entry.build())); } } diff --git a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv4NlriParserTest.java b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv4NlriParserTest.java index c943928989..5d52c72e65 100644 --- a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv4NlriParserTest.java +++ b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv4NlriParserTest.java @@ -147,13 +147,13 @@ public class SimpleFlowspecIpv4NlriParserTest { }; private final SimpleFlowspecExtensionProviderContext flowspecContext = new SimpleFlowspecExtensionProviderContext(); - private final FlowspecActivator fsa = new FlowspecActivator(flowspecContext); - private final SimpleFlowspecIpv4NlriParser FS_PARSER = new SimpleFlowspecIpv4NlriParser(flowspecContext.getFlowspecTypeRegistry(SimpleFlowspecExtensionProviderContext.AFI.IPV4, SimpleFlowspecExtensionProviderContext.SAFI.FLOWSPEC)); + private final FlowspecActivator fsa = new FlowspecActivator(this.flowspecContext); + private final SimpleFlowspecIpv4NlriParser FS_PARSER = new SimpleFlowspecIpv4NlriParser(this.flowspecContext.getFlowspecTypeRegistry(SimpleFlowspecExtensionProviderContext.AFI.IPV4, SimpleFlowspecExtensionProviderContext.SAFI.FLOWSPEC)); @Before public void setUp() { MockitoAnnotations.initMocks(this); - Mockito.doReturn(Optional.of(this.muliPathSupport)).when(constraint).getPeerConstraint(Mockito.any()); + Mockito.doReturn(Optional.of(this.muliPathSupport)).when(this.constraint).getPeerConstraint(Mockito.any()); Mockito.doReturn(true).when(this.muliPathSupport).isTableTypeSupported(Mockito.any()); } @@ -197,7 +197,7 @@ public class SimpleFlowspecIpv4NlriParserTest { ).build() ); - final SimpleFlowspecIpv4NlriParser parser = new SimpleFlowspecIpv4NlriParser(flowspecContext.getFlowspecTypeRegistry(SimpleFlowspecExtensionProviderContext.AFI.IPV4, SimpleFlowspecExtensionProviderContext.SAFI.FLOWSPEC)); + final SimpleFlowspecIpv4NlriParser parser = new SimpleFlowspecIpv4NlriParser(this.flowspecContext.getFlowspecTypeRegistry(SimpleFlowspecExtensionProviderContext.AFI.IPV4, SimpleFlowspecExtensionProviderContext.SAFI.FLOWSPEC)); final MpReachNlriBuilder result = new MpReachNlriBuilder(); result.setAfi(Ipv4AddressFamily.class); @@ -213,7 +213,7 @@ public class SimpleFlowspecIpv4NlriParserTest { parser.serializeAttribute(new AttributesBuilder().addAugmentation(Attributes1.class, new Attributes1Builder().setMpReachNlri(mp.setAfi(Ipv4AddressFamily.class).build()).build()).build(), buffer); assertArrayEquals(REACHED_NLRI, ByteArray.readAllBytes(buffer)); - assertEquals("all packets to 10.0.1.0/32 AND from 1.2.3.4/32 AND where IP protocol equals to 6 AND where port is greater than or equals to 137 and is less than or equals to 139 or equals to 8080 AND where destination port is greater than 4089 or equals to 179 AND where source port equals to 8080 ", FS_PARSER.stringNlri(flows)); + assertEquals("all packets to 10.0.1.0/32 AND from 1.2.3.4/32 AND where IP protocol equals to 6 AND where port is greater than or equals to 137 and is less than or equals to 139 or equals to 8080 AND where destination port is greater than 4089 or equals to 179 AND where source port equals to 8080 ", this.FS_PARSER.stringNlri(flows)); } private void testFlows(final List flows, final DestinationPrefixCase destinationPrefix, final SourcePrefixCase sourcePrefix, @@ -283,7 +283,7 @@ public class SimpleFlowspecIpv4NlriParserTest { ).build() ); - final SimpleFlowspecIpv4NlriParser parser = new SimpleFlowspecIpv4NlriParser(flowspecContext.getFlowspecTypeRegistry(SimpleFlowspecExtensionProviderContext.AFI.IPV4, SimpleFlowspecExtensionProviderContext.SAFI.FLOWSPEC)); + final SimpleFlowspecIpv4NlriParser parser = new SimpleFlowspecIpv4NlriParser(this.flowspecContext.getFlowspecTypeRegistry(SimpleFlowspecExtensionProviderContext.AFI.IPV4, SimpleFlowspecExtensionProviderContext.SAFI.FLOWSPEC)); final MpReachNlriBuilder result = new MpReachNlriBuilder(); result.setAfi(Ipv4AddressFamily.class); @@ -299,7 +299,7 @@ public class SimpleFlowspecIpv4NlriParserTest { parser.serializeAttribute(new AttributesBuilder().addAugmentation(Attributes1.class, new Attributes1Builder().setMpReachNlri(mp.setAfi(Ipv4AddressFamily.class).build()).build()).build(), buffer); assertArrayEquals(REACHED_NLRI_ADD_PATH, ByteArray.readAllBytes(buffer)); - assertEquals("all packets to 10.0.1.0/32 AND from 1.2.3.4/32 AND where IP protocol equals to 6 AND where port is greater than or equals to 137 and is less than or equals to 139 or equals to 8080 AND where destination port is greater than 4089 or equals to 179 AND where source port equals to 8080 ", FS_PARSER.stringNlri(flows)); + assertEquals("all packets to 10.0.1.0/32 AND from 1.2.3.4/32 AND where IP protocol equals to 6 AND where port is greater than or equals to 137 and is less than or equals to 139 or equals to 8080 AND where destination port is greater than 4089 or equals to 179 AND where source port equals to 8080 ", this.FS_PARSER.stringNlri(flows)); } private PortCase createPorts() { @@ -351,7 +351,7 @@ public class SimpleFlowspecIpv4NlriParserTest { ).build() ); - final SimpleFlowspecIpv4NlriParser parser = new SimpleFlowspecIpv4NlriParser(flowspecContext.getFlowspecTypeRegistry(SimpleFlowspecExtensionProviderContext.AFI.IPV4, SimpleFlowspecExtensionProviderContext.SAFI.FLOWSPEC)); + final SimpleFlowspecIpv4NlriParser parser = new SimpleFlowspecIpv4NlriParser(this.flowspecContext.getFlowspecTypeRegistry(SimpleFlowspecExtensionProviderContext.AFI.IPV4, SimpleFlowspecExtensionProviderContext.SAFI.FLOWSPEC)); final MpUnreachNlriBuilder result = new MpUnreachNlriBuilder(); result.setAfi(Ipv4AddressFamily.class); @@ -370,7 +370,7 @@ public class SimpleFlowspecIpv4NlriParserTest { parser.serializeAttribute(new AttributesBuilder().addAugmentation(Attributes2.class, new Attributes2Builder().setMpUnreachNlri(mp.build()).build()).build(), buffer); assertArrayEquals(UNREACHED_NLRI, ByteArray.readAllBytes(buffer)); - assertEquals("all packets where ICMP type is less than 2 or is less than 3 AND where ICMP code is less than 4 or 5 AND where TCP flags is not 1025 or does match 22193 AND where packet length is less than 57005 AND where DSCP is greater than 42 AND where fragment does match 'IS FIRST' 'IS LAST' 'IS A' ", FS_PARSER.stringNlri(flows)); + assertEquals("all packets where ICMP type is less than 2 or is less than 3 AND where ICMP code is less than 4 or 5 AND where TCP flags is not 1025 or does match 22193 AND where packet length is less than 57005 AND where DSCP is greater than 42 AND where fragment does match 'IS FIRST' 'IS LAST' 'IS A' ", this.FS_PARSER.stringNlri(flows)); } @@ -461,7 +461,7 @@ public class SimpleFlowspecIpv4NlriParserTest { ).build() ); - final SimpleFlowspecIpv4NlriParser parser = new SimpleFlowspecIpv4NlriParser(flowspecContext.getFlowspecTypeRegistry(SimpleFlowspecExtensionProviderContext.AFI.IPV4, SimpleFlowspecExtensionProviderContext.SAFI.FLOWSPEC)); + final SimpleFlowspecIpv4NlriParser parser = new SimpleFlowspecIpv4NlriParser(this.flowspecContext.getFlowspecTypeRegistry(SimpleFlowspecExtensionProviderContext.AFI.IPV4, SimpleFlowspecExtensionProviderContext.SAFI.FLOWSPEC)); final MpUnreachNlriBuilder result = new MpUnreachNlriBuilder(); result.setAfi(Ipv4AddressFamily.class); @@ -481,7 +481,7 @@ public class SimpleFlowspecIpv4NlriParserTest { parser.serializeAttribute(new AttributesBuilder().addAugmentation(Attributes2.class, new Attributes2Builder().setMpUnreachNlri(mp.build()).build()).build(), buffer); assertArrayEquals(UNREACHED_NLRI_ADD_PATH, ByteArray.readAllBytes(buffer)); - assertEquals("all packets where ICMP type is less than 2 or is less than 3 AND where ICMP code is less than 4 or 5 AND where TCP flags is not 1025 or does match 22193 AND where packet length is less than 57005 AND where DSCP is greater than 42 AND where fragment does match 'IS FIRST' 'IS LAST' 'IS A' ", FS_PARSER.stringNlri(flows)); + assertEquals("all packets where ICMP type is less than 2 or is less than 3 AND where ICMP code is less than 4 or 5 AND where TCP flags is not 1025 or does match 22193 AND where packet length is less than 57005 AND where DSCP is greater than 42 AND where fragment does match 'IS FIRST' 'IS LAST' 'IS A' ", this.FS_PARSER.stringNlri(flows)); } @@ -501,7 +501,7 @@ public class SimpleFlowspecIpv4NlriParserTest { expectedFS.setFlowspecType(new DestinationPrefixCaseBuilder().setDestinationPrefix(new Ipv4Prefix("127.0.0.5/32")).build()); final List expected = new ArrayList<>(); expected.add(expectedFS.build()); - assertEquals(expected, FS_PARSER.extractFlowspec(entry.build())); + assertEquals(expected, this.FS_PARSER.extractFlowspec(entry.build())); } @Test @@ -520,7 +520,7 @@ public class SimpleFlowspecIpv4NlriParserTest { expectedFS.setFlowspecType(new SourcePrefixCaseBuilder().setSourcePrefix(new Ipv4Prefix("127.0.0.6/32")).build()); final List expected = new ArrayList<>(); expected.add(expectedFS.build()); - assertEquals(expected, FS_PARSER.extractFlowspec(entry.build())); + assertEquals(expected, this.FS_PARSER.extractFlowspec(entry.build())); } @Test @@ -552,7 +552,7 @@ public class SimpleFlowspecIpv4NlriParserTest { new ProtocolIpsBuilder().setValue((short) 240).setOp(new NumericOperand(true, true, true, false, false)).build())).build()); final List expected = new ArrayList<>(); expected.add(expectedFS.build()); - assertEquals(expected, FS_PARSER.extractFlowspec(entry.build())); + assertEquals(expected, this.FS_PARSER.extractFlowspec(entry.build())); } @Test @@ -575,7 +575,7 @@ public class SimpleFlowspecIpv4NlriParserTest { expectedFS.setFlowspecType(new PortCaseBuilder().setPorts(Lists.newArrayList(new PortsBuilder().setValue(100).setOp(new NumericOperand(true, true, false, false, true)).build())).build()); final List expected = new ArrayList<>(); expected.add(expectedFS.build()); - assertEquals(expected, FS_PARSER.extractFlowspec(entry.build())); + assertEquals(expected, this.FS_PARSER.extractFlowspec(entry.build())); } @Test @@ -597,7 +597,7 @@ public class SimpleFlowspecIpv4NlriParserTest { expectedFS.setFlowspecType(new DestinationPortCaseBuilder().setDestinationPorts(Lists.newArrayList(new DestinationPortsBuilder().setValue(1024).setOp(new NumericOperand(false, true, true, false, false)).build())).build()); final List expected = new ArrayList<>(); expected.add(expectedFS.build()); - assertEquals(expected, FS_PARSER.extractFlowspec(entry.build())); + assertEquals(expected, this.FS_PARSER.extractFlowspec(entry.build())); } @Test @@ -619,7 +619,7 @@ public class SimpleFlowspecIpv4NlriParserTest { expectedFS.setFlowspecType(new SourcePortCaseBuilder().setSourcePorts(Lists.newArrayList(new SourcePortsBuilder().setValue(8080).setOp(new NumericOperand(true, true, true, true, true)).build())).build()); final List expected = new ArrayList<>(); expected.add(expectedFS.build()); - assertEquals(expected, FS_PARSER.extractFlowspec(entry.build())); + assertEquals(expected, this.FS_PARSER.extractFlowspec(entry.build())); } @Test @@ -641,7 +641,7 @@ public class SimpleFlowspecIpv4NlriParserTest { expectedFS.setFlowspecType(new IcmpTypeCaseBuilder().setTypes(Lists.newArrayList(new TypesBuilder().setValue((short) 22).setOp(new NumericOperand(true, true, true, true, true)).build())).build()); final List expected = new ArrayList<>(); expected.add(expectedFS.build()); - assertEquals(expected, FS_PARSER.extractFlowspec(entry.build())); + assertEquals(expected, this.FS_PARSER.extractFlowspec(entry.build())); } @Test @@ -663,7 +663,7 @@ public class SimpleFlowspecIpv4NlriParserTest { expectedFS.setFlowspecType(new IcmpCodeCaseBuilder().setCodes(Lists.newArrayList(new CodesBuilder().setValue((short) 23).setOp(new NumericOperand(false, false, false, false, false)).build())).build()); final List expected = new ArrayList<>(); expected.add(expectedFS.build()); - assertEquals(expected, FS_PARSER.extractFlowspec(entry.build())); + assertEquals(expected, this.FS_PARSER.extractFlowspec(entry.build())); } @Test @@ -685,7 +685,7 @@ public class SimpleFlowspecIpv4NlriParserTest { expectedFS.setFlowspecType(new TcpFlagsCaseBuilder().setTcpFlags(Lists.newArrayList(new TcpFlagsBuilder().setValue(99).setOp(new BitmaskOperand(true, true, false, false)).build())).build()); final List expected = new ArrayList<>(); expected.add(expectedFS.build()); - assertEquals(expected, FS_PARSER.extractFlowspec(entry.build())); + assertEquals(expected, this.FS_PARSER.extractFlowspec(entry.build())); } @Test @@ -707,7 +707,7 @@ public class SimpleFlowspecIpv4NlriParserTest { expectedFS.setFlowspecType(new PacketLengthCaseBuilder().setPacketLengths(Lists.newArrayList(new PacketLengthsBuilder().setValue(101).setOp(new NumericOperand(true, false, false, true, false)).build())).build()); final List expected = new ArrayList<>(); expected.add(expectedFS.build()); - assertEquals(expected, FS_PARSER.extractFlowspec(entry.build())); + assertEquals(expected, this.FS_PARSER.extractFlowspec(entry.build())); } @Test @@ -729,7 +729,7 @@ public class SimpleFlowspecIpv4NlriParserTest { expectedFS.setFlowspecType(new DscpCaseBuilder().setDscps(Lists.newArrayList(new DscpsBuilder().setValue(new Dscp((short) 15)).setOp(new NumericOperand(true, true, false, true, false)).build())).build()); final List expected = new ArrayList<>(); expected.add(expectedFS.build()); - assertEquals(expected, FS_PARSER.extractFlowspec(entry.build())); + assertEquals(expected, this.FS_PARSER.extractFlowspec(entry.build())); } @Test @@ -751,7 +751,7 @@ public class SimpleFlowspecIpv4NlriParserTest { expectedFS.setFlowspecType(new FragmentCaseBuilder().setFragments(Lists.newArrayList(new FragmentsBuilder().setValue(new Fragment(true, true, true, true)).setOp(new BitmaskOperand(true, true, true, true)).build())).build()); final List expected = new ArrayList<>(); expected.add(expectedFS.build()); - assertEquals(expected, FS_PARSER.extractFlowspec(entry.build())); + assertEquals(expected, this.FS_PARSER.extractFlowspec(entry.build())); } } diff --git a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv6NlriParserTest.java b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv6NlriParserTest.java index 2234b0a27a..c8e8c3ffa6 100644 --- a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv6NlriParserTest.java +++ b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv6NlriParserTest.java @@ -80,8 +80,8 @@ public class SimpleFlowspecIpv6NlriParserTest { @Mock private MultiPathSupport muliPathSupport; private final SimpleFlowspecExtensionProviderContext flowspecContext = new SimpleFlowspecExtensionProviderContext(); - private final FlowspecActivator fsa = new FlowspecActivator(flowspecContext); - private final SimpleFlowspecIpv6NlriParser FS_PARSER = new SimpleFlowspecIpv6NlriParser(flowspecContext.getFlowspecTypeRegistry(SimpleFlowspecExtensionProviderContext.AFI.IPV6, SimpleFlowspecExtensionProviderContext.SAFI.FLOWSPEC)); + private final FlowspecActivator fsa = new FlowspecActivator(this.flowspecContext); + private final SimpleFlowspecIpv6NlriParser FS_PARSER = new SimpleFlowspecIpv6NlriParser(this.flowspecContext.getFlowspecTypeRegistry(SimpleFlowspecExtensionProviderContext.AFI.IPV6, SimpleFlowspecExtensionProviderContext.SAFI.FLOWSPEC)); private static final byte[] REACHED_NLRI = new byte[] { 0x13, @@ -112,7 +112,7 @@ public class SimpleFlowspecIpv6NlriParserTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - Mockito.doReturn(Optional.of(this.muliPathSupport)).when(constraint).getPeerConstraint(Mockito.any()); + Mockito.doReturn(Optional.of(this.muliPathSupport)).when(this.constraint).getPeerConstraint(Mockito.any()); Mockito.doReturn(true).when(this.muliPathSupport).isTableTypeSupported(Mockito.any()); } @@ -150,7 +150,7 @@ public class SimpleFlowspecIpv6NlriParserTest { final MpReachNlriBuilder result = new MpReachNlriBuilder(); result.setAfi(Ipv6AddressFamily.class); result.setSafi(FlowspecSubsequentAddressFamily.class); - FS_PARSER.parseNlri(Unpooled.wrappedBuffer(REACHED_NLRI), result); + this.FS_PARSER.parseNlri(Unpooled.wrappedBuffer(REACHED_NLRI), result); final List flows = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.reach.nlri.advertized.routes.destination.type.DestinationFlowspecIpv6Case) (result.getAdvertizedRoutes().getDestinationType())) .getDestinationFlowspec().getFlowspec(); @@ -160,10 +160,10 @@ public class SimpleFlowspecIpv6NlriParserTest { assertEquals(headersCase, flows.get(2).getFlowspecType()); final ByteBuf buffer = Unpooled.buffer(); - FS_PARSER.serializeAttribute(new AttributesBuilder().addAugmentation(Attributes1.class, new Attributes1Builder().setMpReachNlri(mp.setAfi(Ipv6AddressFamily.class).build()).build()).build(), buffer); + this.FS_PARSER.serializeAttribute(new AttributesBuilder().addAugmentation(Attributes1.class, new Attributes1Builder().setMpReachNlri(mp.setAfi(Ipv6AddressFamily.class).build()).build()).build(), buffer); assertArrayEquals(REACHED_NLRI, ByteArray.readAllBytes(buffer)); - assertEquals("all packets to 102:304:500::/40 AND from 102:304:600::/40 AND where next header equals to 6 ", FS_PARSER.stringNlri(flows)); + assertEquals("all packets to 102:304:500::/40 AND from 102:304:600::/40 AND where next header equals to 6 ", this.FS_PARSER.stringNlri(flows)); } @Test @@ -200,7 +200,7 @@ public class SimpleFlowspecIpv6NlriParserTest { final MpReachNlriBuilder result = new MpReachNlriBuilder(); result.setAfi(Ipv6AddressFamily.class); result.setSafi(FlowspecSubsequentAddressFamily.class); - FS_PARSER.parseNlri(Unpooled.wrappedBuffer(REACHED_NLRI_ADD_PATH), result, this.constraint); + this.FS_PARSER.parseNlri(Unpooled.wrappedBuffer(REACHED_NLRI_ADD_PATH), result, this.constraint); final List flows = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.reach.nlri.advertized.routes.destination.type.DestinationFlowspecIpv6Case) (result.getAdvertizedRoutes().getDestinationType())) .getDestinationFlowspec().getFlowspec(); @@ -210,10 +210,10 @@ public class SimpleFlowspecIpv6NlriParserTest { assertEquals(headersCase, flows.get(2).getFlowspecType()); final ByteBuf buffer = Unpooled.buffer(); - FS_PARSER.serializeAttribute(new AttributesBuilder().addAugmentation(Attributes1.class, new Attributes1Builder().setMpReachNlri(mp.setAfi(Ipv6AddressFamily.class).build()).build()).build(), buffer); + this.FS_PARSER.serializeAttribute(new AttributesBuilder().addAugmentation(Attributes1.class, new Attributes1Builder().setMpReachNlri(mp.setAfi(Ipv6AddressFamily.class).build()).build()).build(), buffer); assertArrayEquals(REACHED_NLRI_ADD_PATH, ByteArray.readAllBytes(buffer)); - assertEquals("all packets to 102:304:500::/40 AND from 102:304:600::/40 AND where next header equals to 6 ", FS_PARSER.stringNlri(flows)); + assertEquals("all packets to 102:304:500::/40 AND from 102:304:600::/40 AND where next header equals to 6 ", this.FS_PARSER.stringNlri(flows)); } @Test @@ -244,7 +244,7 @@ public class SimpleFlowspecIpv6NlriParserTest { final MpUnreachNlriBuilder result = new MpUnreachNlriBuilder(); result.setAfi(Ipv6AddressFamily.class); result.setSafi(FlowspecSubsequentAddressFamily.class); - FS_PARSER.parseNlri(Unpooled.wrappedBuffer(UNREACHED_NLRI), result); + this.FS_PARSER.parseNlri(Unpooled.wrappedBuffer(UNREACHED_NLRI), result); final List flows = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationFlowspecIpv6Case) (result.getWithdrawnRoutes().getDestinationType())) .getDestinationFlowspec().getFlowspec(); @@ -253,11 +253,11 @@ public class SimpleFlowspecIpv6NlriParserTest { assertEquals(label, flows.get(1).getFlowspecType()); final ByteBuf buffer = Unpooled.buffer(); - FS_PARSER.serializeAttribute(new AttributesBuilder().addAugmentation(Attributes2.class, new Attributes2Builder().setMpUnreachNlri(mp.build()).build()).build(), buffer); + this.FS_PARSER.serializeAttribute(new AttributesBuilder().addAugmentation(Attributes2.class, new Attributes2Builder().setMpUnreachNlri(mp.build()).build()).build(), buffer); assertArrayEquals(UNREACHED_NLRI, ByteArray.readAllBytes(buffer)); - assertEquals("all packets where fragment does match 'IS FIRST' 'IS LAST' 'IS A' AND where flow label equals to 16777222 or equals to 258 ", FS_PARSER.stringNlri(flows)); + assertEquals("all packets where fragment does match 'IS FIRST' 'IS LAST' 'IS A' AND where flow label equals to 16777222 or equals to 258 ", this.FS_PARSER.stringNlri(flows)); } private FragmentCase createFragment() { @@ -301,7 +301,7 @@ public class SimpleFlowspecIpv6NlriParserTest { final MpUnreachNlriBuilder result = new MpUnreachNlriBuilder(); result.setAfi(Ipv6AddressFamily.class); result.setSafi(FlowspecSubsequentAddressFamily.class); - FS_PARSER.parseNlri(Unpooled.wrappedBuffer(UNREACHED_NLRI_ADD_PATH), result, this.constraint); + this.FS_PARSER.parseNlri(Unpooled.wrappedBuffer(UNREACHED_NLRI_ADD_PATH), result, this.constraint); final List flows = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.update.attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationFlowspecIpv6Case) (result.getWithdrawnRoutes().getDestinationType())) .getDestinationFlowspec().getFlowspec(); @@ -310,11 +310,11 @@ public class SimpleFlowspecIpv6NlriParserTest { assertEquals(label, flows.get(1).getFlowspecType()); final ByteBuf buffer = Unpooled.buffer(); - FS_PARSER.serializeAttribute(new AttributesBuilder().addAugmentation(Attributes2.class, new Attributes2Builder().setMpUnreachNlri(mp.build()).build()).build(), buffer); + this.FS_PARSER.serializeAttribute(new AttributesBuilder().addAugmentation(Attributes2.class, new Attributes2Builder().setMpUnreachNlri(mp.build()).build()).build(), buffer); assertArrayEquals(UNREACHED_NLRI_ADD_PATH, ByteArray.readAllBytes(buffer)); - assertEquals("all packets where fragment does match 'IS FIRST' 'IS LAST' 'IS A' AND where flow label equals to 16777222 or equals to 258 ", FS_PARSER.stringNlri(flows)); + assertEquals("all packets where fragment does match 'IS FIRST' 'IS LAST' 'IS A' AND where flow label equals to 16777222 or equals to 258 ", this.FS_PARSER.stringNlri(flows)); } @Test @@ -336,7 +336,7 @@ public class SimpleFlowspecIpv6NlriParserTest { expectedFS.setFlowspecType(new FragmentCaseBuilder().setFragments(Lists.newArrayList(new FragmentsBuilder().setValue(new Fragment(true, true, true, true)).setOp(new BitmaskOperand(true, true, true, true)).build())).build()); final List expectedValue = new ArrayList<>(); expectedValue.add(expectedFS.build()); - assertEquals(expectedValue, FS_PARSER.extractFlowspec(entry.build())); + assertEquals(expectedValue, this.FS_PARSER.extractFlowspec(entry.build())); } @Test @@ -368,7 +368,7 @@ public class SimpleFlowspecIpv6NlriParserTest { new NextHeadersBuilder().setValue((short) 210).setOp(new NumericOperand(true, true, true, false, false)).build())).build()); final List expectedValue = new ArrayList<>(); expectedValue.add(expectedFS.build()); - assertEquals(expectedValue, FS_PARSER.extractFlowspec(entry.build())); + assertEquals(expectedValue, this.FS_PARSER.extractFlowspec(entry.build())); } @Test @@ -396,7 +396,7 @@ public class SimpleFlowspecIpv6NlriParserTest { new FlowLabelBuilder().setValue(200L).setOp(new NumericOperand(true, false, false, false, false)).build())).build()); final List expectedValue = new ArrayList<>(); expectedValue.add(expectedFS.build()); - assertEquals(expectedValue, FS_PARSER.extractFlowspec(entry.build())); + assertEquals(expectedValue, this.FS_PARSER.extractFlowspec(entry.build())); } @Test @@ -414,7 +414,7 @@ public class SimpleFlowspecIpv6NlriParserTest { expectedFS.setFlowspecType(new DestinationIpv6PrefixCaseBuilder().setDestinationPrefix(new Ipv6Prefix("102:304:500::/40")).build()); final List expectedValue = new ArrayList<>(); expectedValue.add(expectedFS.build()); - assertEquals(expectedValue, FS_PARSER.extractFlowspec(entry.build())); + assertEquals(expectedValue, this.FS_PARSER.extractFlowspec(entry.build())); } @Test @@ -432,7 +432,7 @@ public class SimpleFlowspecIpv6NlriParserTest { expectedFS.setFlowspecType(new SourceIpv6PrefixCaseBuilder().setSourcePrefix(new Ipv6Prefix("102:304:600::/40")).build()); final List expectedValue = new ArrayList<>(); expectedValue.add(expectedFS.build()); - assertEquals(expectedValue, FS_PARSER.extractFlowspec(entry.build())); + assertEquals(expectedValue, this.FS_PARSER.extractFlowspec(entry.build())); } } diff --git a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/extended/communities/FSExtendedCommunitiesTest.java b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/extended/communities/FSExtendedCommunitiesTest.java index fdf1779df0..830382d9a9 100644 --- a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/extended/communities/FSExtendedCommunitiesTest.java +++ b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/extended/communities/FSExtendedCommunitiesTest.java @@ -216,7 +216,7 @@ public class FSExtendedCommunitiesTest { final ExtendedCommunities expected = new ExtendedCommunitiesBuilder().setExtendedCommunity(redirect).setTransitive(true).build(); - final ExtendedCommunities parsed = registry.parseExtendedCommunity(Unpooled.copiedBuffer(REDIRECT_AS_4BYTES)); + final ExtendedCommunities parsed = this.registry.parseExtendedCommunity(Unpooled.copiedBuffer(REDIRECT_AS_4BYTES)); Assert.assertEquals(expected, parsed); } @@ -228,7 +228,7 @@ public class FSExtendedCommunitiesTest { final ExtendedCommunities expected = new ExtendedCommunitiesBuilder().setExtendedCommunity(redirect).setTransitive(true).build(); final ByteBuf output = Unpooled.buffer(REDIRECT_AS_4BYTES.length); - registry.serializeExtendedCommunity(expected, output); + this.registry.serializeExtendedCommunity(expected, output); Assert.assertArrayEquals(REDIRECT_AS_4BYTES, output.array()); } @@ -239,7 +239,7 @@ public class FSExtendedCommunitiesTest { final ExtendedCommunities expected = new ExtendedCommunitiesBuilder().setExtendedCommunity(redirect).setTransitive(true).build(); - final ExtendedCommunities parsed = registry.parseExtendedCommunity(Unpooled.copiedBuffer(REDIRECT_IPV4)); + final ExtendedCommunities parsed = this.registry.parseExtendedCommunity(Unpooled.copiedBuffer(REDIRECT_IPV4)); Assert.assertEquals(expected, parsed); } @@ -251,7 +251,7 @@ public class FSExtendedCommunitiesTest { final ExtendedCommunities expected = new ExtendedCommunitiesBuilder().setExtendedCommunity(redirect).setTransitive(true).build(); final ByteBuf output = Unpooled.buffer(REDIRECT_IPV4.length); - registry.serializeExtendedCommunity(expected, output); + this.registry.serializeExtendedCommunity(expected, output); Assert.assertArrayEquals(REDIRECT_IPV4, output.array()); } @@ -262,7 +262,7 @@ public class FSExtendedCommunitiesTest { final ExtendedCommunities expected = new ExtendedCommunitiesBuilder().setExtendedCommunity(redirect).setTransitive(true).build(); - final ExtendedCommunities parsed = registry.parseExtendedCommunity(Unpooled.copiedBuffer(REDIRECT_NH_IPV4)); + final ExtendedCommunities parsed = this.registry.parseExtendedCommunity(Unpooled.copiedBuffer(REDIRECT_NH_IPV4)); Assert.assertEquals(expected, parsed); } @@ -274,7 +274,7 @@ public class FSExtendedCommunitiesTest { final ExtendedCommunities expected = new ExtendedCommunitiesBuilder().setExtendedCommunity(redirect).setTransitive(true).build(); final ByteBuf output = Unpooled.buffer(REDIRECT_NH_IPV4.length); - registry.serializeExtendedCommunity(expected, output); + this.registry.serializeExtendedCommunity(expected, output); Assert.assertArrayEquals(REDIRECT_NH_IPV4, output.array()); } @@ -285,7 +285,7 @@ public class FSExtendedCommunitiesTest { final ExtendedCommunities expected = new ExtendedCommunitiesBuilder().setExtendedCommunity(redirect).setTransitive(true).build(); - final ExtendedCommunities parsed = registry.parseExtendedCommunity(Unpooled.copiedBuffer(REDIRECT_NH_IPV6)); + final ExtendedCommunities parsed = this.registry.parseExtendedCommunity(Unpooled.copiedBuffer(REDIRECT_NH_IPV6)); Assert.assertEquals(expected, parsed); } @@ -297,7 +297,7 @@ public class FSExtendedCommunitiesTest { final ExtendedCommunities expected = new ExtendedCommunitiesBuilder().setExtendedCommunity(redirect).setTransitive(true).build(); final ByteBuf output = Unpooled.buffer(REDIRECT_NH_IPV6.length); - registry.serializeExtendedCommunity(expected, output); + this.registry.serializeExtendedCommunity(expected, output); Assert.assertArrayEquals(REDIRECT_NH_IPV6, output.array()); } diff --git a/bgp/inet/src/test/java/org/opendaylight/protocol/bgp/inet/codec/nexthop/NextHopParserSerializerTest.java b/bgp/inet/src/test/java/org/opendaylight/protocol/bgp/inet/codec/nexthop/NextHopParserSerializerTest.java index a4ea2eebaa..806f13cc46 100644 --- a/bgp/inet/src/test/java/org/opendaylight/protocol/bgp/inet/codec/nexthop/NextHopParserSerializerTest.java +++ b/bgp/inet/src/test/java/org/opendaylight/protocol/bgp/inet/codec/nexthop/NextHopParserSerializerTest.java @@ -46,42 +46,42 @@ public class NextHopParserSerializerTest { @Before public final void setUp() { - ipv4NextHopParserSerializer = new Ipv4NextHopParserSerializer(); - ipv6NextHopParserSerializer = new Ipv6NextHopParserSerializer(); - buffer = Unpooled.buffer(); + this.ipv4NextHopParserSerializer = new Ipv4NextHopParserSerializer(); + this.ipv6NextHopParserSerializer = new Ipv6NextHopParserSerializer(); + this.buffer = Unpooled.buffer(); } @Test public void testSerializeIpv4NextHopCase() throws BGPParsingException { final byte[] ipv4B = {42, 42, 42, 42}; - hop = new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder() + this.hop = new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder() .setGlobal(new Ipv4Address("42.42.42.42")).build()).build(); - ipv4NextHopParserSerializer.serializeNextHop(hop, buffer); - assertArrayEquals(ipv4B, ByteArray.readAllBytes(buffer)); + this.ipv4NextHopParserSerializer.serializeNextHop(this.hop, this.buffer); + assertArrayEquals(ipv4B, ByteArray.readAllBytes(this.buffer)); - final CNextHop parsedHop = ipv4NextHopParserSerializer.parseNextHop(Unpooled.wrappedBuffer(ipv4B)); - assertTrue(hop instanceof Ipv4NextHopCase); - assertEquals(hop, parsedHop); + final CNextHop parsedHop = this.ipv4NextHopParserSerializer.parseNextHop(Unpooled.wrappedBuffer(ipv4B)); + assertTrue(this.hop instanceof Ipv4NextHopCase); + assertEquals(this.hop, parsedHop); } @Test public void testSerializeIpv6LinkNextHopCase() throws BGPParsingException { - hop = new Ipv6NextHopCaseBuilder().setIpv6NextHop(new Ipv6NextHopBuilder().setGlobal(ipv6).setLinkLocal(ipv6l).build()).build(); - buffer.clear(); - ipv6NextHopParserSerializer.serializeNextHop(hop, buffer); - assertArrayEquals(ipv6lB, ByteArray.readAllBytes(buffer)); + this.hop = new Ipv6NextHopCaseBuilder().setIpv6NextHop(new Ipv6NextHopBuilder().setGlobal(ipv6).setLinkLocal(ipv6l).build()).build(); + this.buffer.clear(); + this.ipv6NextHopParserSerializer.serializeNextHop(this.hop, this.buffer); + assertArrayEquals(ipv6lB, ByteArray.readAllBytes(this.buffer)); - final CNextHop parsedHop = ipv6NextHopParserSerializer.parseNextHop(Unpooled.wrappedBuffer(ipv6lB)); + final CNextHop parsedHop = this.ipv6NextHopParserSerializer.parseNextHop(Unpooled.wrappedBuffer(ipv6lB)); assertTrue(parsedHop instanceof Ipv6NextHopCase); - assertEquals(hop, parsedHop); + assertEquals(this.hop, parsedHop); } @Test public void testSerializeIpv4NextHopEmpty() { - buffer.clear(); + this.buffer.clear(); try { - ipv4NextHopParserSerializer.serializeNextHop(() -> null, buffer); + this.ipv4NextHopParserSerializer.serializeNextHop(() -> null, this.buffer); } catch (final IllegalArgumentException e) { assertEquals("cNextHop is not a Ipv4 NextHop object.", e.getMessage()); } @@ -89,9 +89,9 @@ public class NextHopParserSerializerTest { @Test public void testSerializeIpv6NextHopEmpty() { - buffer.clear(); + this.buffer.clear(); try { - ipv6NextHopParserSerializer.serializeNextHop(() -> null, buffer); + this.ipv6NextHopParserSerializer.serializeNextHop(() -> null, this.buffer); } catch (final IllegalArgumentException e) { assertEquals("cNextHop is not a Ipv6 NextHop object.", e.getMessage()); } diff --git a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/AbstractVpnNextHopParserSerializer.java b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/AbstractVpnNextHopParserSerializer.java index 5edb84b577..a03f2ac5bd 100644 --- a/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/AbstractVpnNextHopParserSerializer.java +++ b/bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/AbstractVpnNextHopParserSerializer.java @@ -29,14 +29,14 @@ public abstract class AbstractVpnNextHopParserSerializer implements NextHopParse @Override public CNextHop parseNextHop(final ByteBuf buffer) throws BGPParsingException { - Preconditions.checkArgument(buffer.readableBytes() == (ipAddrLength + RouteDistinguisherUtil.RD_LENGTH), "Length of byte array for NEXT_HOP should be %s, but is %s", ipAddrLength + RouteDistinguisherUtil.RD_LENGTH, buffer.readableBytes()); + Preconditions.checkArgument(buffer.readableBytes() == (this.ipAddrLength + RouteDistinguisherUtil.RD_LENGTH), "Length of byte array for NEXT_HOP should be %s, but is %s", this.ipAddrLength + RouteDistinguisherUtil.RD_LENGTH, buffer.readableBytes()); buffer.readBytes(RouteDistinguisherUtil.RD_LENGTH); - return NextHopUtil.parseNextHop(buffer.readBytes(ipAddrLength)); + return NextHopUtil.parseNextHop(buffer.readBytes(this.ipAddrLength)); } @Override public void serializeNextHop(final CNextHop cNextHop, final ByteBuf byteAggregator) { - Preconditions.checkArgument(ipNextHopCaseClazz.isInstance(cNextHop), "cNextHop is not a VPN %s NextHop object.", ipNextHopCaseClazz.getSimpleName()); + Preconditions.checkArgument(this.ipNextHopCaseClazz.isInstance(cNextHop), "cNextHop is not a VPN %s NextHop object.", this.ipNextHopCaseClazz.getSimpleName()); byteAggregator.writeZero(RouteDistinguisherUtil.RD_LENGTH); NextHopUtil.serializeNextHop(cNextHop, byteAggregator); } diff --git a/bgp/labeled-unicast/src/test/java/org/opendaylight/protocol/bgp/labeled/unicast/LUNlriParserTest.java b/bgp/labeled-unicast/src/test/java/org/opendaylight/protocol/bgp/labeled/unicast/LUNlriParserTest.java index a06b71ae4c..695e291338 100755 --- a/bgp/labeled-unicast/src/test/java/org/opendaylight/protocol/bgp/labeled/unicast/LUNlriParserTest.java +++ b/bgp/labeled-unicast/src/test/java/org/opendaylight/protocol/bgp/labeled/unicast/LUNlriParserTest.java @@ -220,7 +220,7 @@ public class LUNlriParserTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - Mockito.doReturn(Optional.of(this.muliPathSupport)).when(constraint).getPeerConstraint(Mockito.any()); + Mockito.doReturn(Optional.of(this.muliPathSupport)).when(this.constraint).getPeerConstraint(Mockito.any()); Mockito.doReturn(true).when(this.muliPathSupport).isTableTypeSupported(Mockito.any()); } diff --git a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/BGPActivator.java b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/BGPActivator.java index 12ec7316ce..7c1ae46e9b 100644 --- a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/BGPActivator.java +++ b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/BGPActivator.java @@ -88,7 +88,7 @@ public final class BGPActivator extends AbstractBGPExtensionProviderActivator { public BGPActivator() { super(); this.ianaLinkstateAttributeType = true; - rsvpTeObjectRegistry = null; + this.rsvpTeObjectRegistry = null; } public BGPActivator(final boolean ianaLinkstateAttributeType, final RSVPTeObjectRegistry rsvpTeObjectRegistry) { diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/ExtendedCommunitiesAttributeParser.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/ExtendedCommunitiesAttributeParser.java index 29bc1b165d..255af83204 100644 --- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/ExtendedCommunitiesAttributeParser.java +++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/ExtendedCommunitiesAttributeParser.java @@ -38,7 +38,7 @@ public final class ExtendedCommunitiesAttributeParser implements AttributeParser public void parseAttribute(final ByteBuf buffer, final AttributesBuilder builder) throws BGPDocumentedException, BGPParsingException { final List set = new ArrayList<>(); while (buffer.isReadable()) { - final ExtendedCommunities exComm = ecReg.parseExtendedCommunity(buffer); + final ExtendedCommunities exComm = this.ecReg.parseExtendedCommunity(buffer); if (exComm != null) { set.add(exComm); } diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/CommunityTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/CommunityTest.java index da87a9c4eb..7d9d9aa966 100644 --- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/CommunityTest.java +++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/CommunityTest.java @@ -21,8 +21,8 @@ public class CommunityTest { @Test public void testCommunity() { - util.create(10, 222); - final Community c = util.create(12, 12); + this.util.create(10, 222); + final Community c = this.util.create(12, 12); assertEquals(12, c.getAsNumber().getValue().intValue()); assertEquals(12, c.getSemantics().intValue()); } @@ -30,13 +30,13 @@ public class CommunityTest { @Test public void testOverflows() { try { - util.create(10, -2); + this.util.create(10, -2); fail("Semantics under range."); } catch (final IllegalArgumentException e) { assertEquals("Invalid range: -2, expected: [[0‥65535]].", e.getMessage()); } try { - util.create(10, 65536); + this.util.create(10, 65536); fail("Semantics above range."); } catch (final IllegalArgumentException e) { assertEquals("Invalid range: 65536, expected: [[0‥65535]].", e.getMessage()); @@ -45,13 +45,13 @@ public class CommunityTest { @Test public void testToString() { - final Community c = util.create(10, 222); + final Community c = this.util.create(10, 222); assertNotNull(c.toString()); } @Test public void testValueOf() { - final Community comm = util.valueOf("12:50"); + final Community comm = this.util.valueOf("12:50"); assertEquals(12, comm.getAsNumber().getValue().intValue()); assertEquals(50, comm.getSemantics().intValue()); } diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/AbstractFamilyRegistry.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/AbstractFamilyRegistry.java index 41d863fe97..45f7e0a3d6 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/AbstractFamilyRegistry.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/AbstractFamilyRegistry.java @@ -21,14 +21,14 @@ abstract class AbstractFamilyRegistry { protected synchronized AutoCloseable registerFamily(final Class clazz, final N number) { Preconditions.checkNotNull(clazz); - final Class c = numberToClass.get(number); + final Class c = this.numberToClass.get(number); Preconditions.checkState(c == null, "Number " + number + " already registered to " + c); - final N n = classToNumber.get(clazz); + final N n = this.classToNumber.get(clazz); Preconditions.checkState(n == null, "Class " + clazz + " already registered to " + n); - numberToClass.put(number, clazz); - classToNumber.put(clazz, number); + this.numberToClass.put(number, clazz); + this.classToNumber.put(clazz, number); final Object lock = this; return new AbstractRegistration() { @@ -36,18 +36,18 @@ abstract class AbstractFamilyRegistry { @Override protected void removeRegistration() { synchronized (lock) { - classToNumber.remove(clazz); - numberToClass.remove(number); + AbstractFamilyRegistry.this.classToNumber.remove(clazz); + AbstractFamilyRegistry.this.numberToClass.remove(number); } } }; } protected Class classForFamily(final N number) { - return numberToClass.get(number); + return this.numberToClass.get(number); } protected N numberForClass(final Class clazz) { - return classToNumber.get(clazz); + return this.classToNumber.get(clazz); } } diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleBGPExtensionProviderContextActivator.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleBGPExtensionProviderContextActivator.java index 11bac1d23f..13dae6c5c2 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleBGPExtensionProviderContextActivator.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleBGPExtensionProviderContextActivator.java @@ -32,18 +32,18 @@ public class SimpleBGPExtensionProviderContextActivator implements AutoCloseable } public void start() { - LOG.debug("Starting {} BGPExtensionProviderActivator instances", extensionActivators.size()); + LOG.debug("Starting {} BGPExtensionProviderActivator instances", this.extensionActivators.size()); - for(final BGPExtensionProviderActivator e : extensionActivators) { - e.start(providerContext); + for(final BGPExtensionProviderActivator e : this.extensionActivators) { + e.start(this.providerContext); } } @Override public void close() { - LOG.debug("Stopping {} BGPExtensionProviderActivator instances", extensionActivators.size()); + LOG.debug("Stopping {} BGPExtensionProviderActivator instances", this.extensionActivators.size()); - for(final BGPExtensionProviderActivator e : extensionActivators) { + for(final BGPExtensionProviderActivator e : this.extensionActivators) { e.stop(); } } diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleExtendedCommunityRegistry.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleExtendedCommunityRegistry.java index 46f1abab29..3cb453e9a0 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleExtendedCommunityRegistry.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleExtendedCommunityRegistry.java @@ -70,12 +70,12 @@ final class SimpleExtendedCommunityRegistry implements ExtendedCommunityRegistry synchronized AutoCloseable registerExtendedCommunitySerializer( final Class extendedCommunityClass, final ExtendedCommunitySerializer serializer) { - return handlers.registerSerializer(extendedCommunityClass, serializer); + return this.handlers.registerSerializer(extendedCommunityClass, serializer); } synchronized AutoCloseable registerExtendedCommunityParser(final int type, final int subtype, final ExtendedCommunityParser parser) { checkTypes(type, subtype); - return handlers.registerParser(createKey(type, subtype), parser); + return this.handlers.registerParser(createKey(type, subtype), parser); } private static void checkTypes(final int type, final int subtype) { diff --git a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleExtendedCommunityRegistryTest.java b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleExtendedCommunityRegistryTest.java index bd7939ff21..31542228be 100644 --- a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleExtendedCommunityRegistryTest.java +++ b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleExtendedCommunityRegistryTest.java @@ -35,27 +35,27 @@ public class SimpleExtendedCommunityRegistryTest { @Before public void setup() throws BGPDocumentedException, BGPParsingException { - register = new SimpleExtendedCommunityRegistry(); - register.registerExtendedCommunityParser(0, 0, parser); - register.registerExtendedCommunitySerializer(RouteTargetIpv4Case.class, serializer); - Mockito.doReturn(0).when(serializer).getType(Mockito.anyBoolean()); - Mockito.doReturn(0).when(serializer).getSubType(); - Mockito.doNothing().when(serializer).serializeExtendedCommunity(Mockito.any(ExtendedCommunity.class), Mockito.any(ByteBuf.class)); - Mockito.doReturn(null).when(parser).parseExtendedCommunity(Mockito.any(ByteBuf.class)); + this.register = new SimpleExtendedCommunityRegistry(); + this.register.registerExtendedCommunityParser(0, 0, this.parser); + this.register.registerExtendedCommunitySerializer(RouteTargetIpv4Case.class, this.serializer); + Mockito.doReturn(0).when(this.serializer).getType(Mockito.anyBoolean()); + Mockito.doReturn(0).when(this.serializer).getSubType(); + Mockito.doNothing().when(this.serializer).serializeExtendedCommunity(Mockito.any(ExtendedCommunity.class), Mockito.any(ByteBuf.class)); + Mockito.doReturn(null).when(this.parser).parseExtendedCommunity(Mockito.any(ByteBuf.class)); } @Test public void testExtendedCommunityRegistry() throws BGPDocumentedException, BGPParsingException { final ByteBuf output = Unpooled.buffer(); - register.serializeExtendedCommunity( + this.register.serializeExtendedCommunity( new ExtendedCommunitiesBuilder().setTransitive(true).setExtendedCommunity(new RouteTargetIpv4CaseBuilder().setRouteTargetIpv4(new RouteTargetIpv4Builder().build()).build()).build(), output); - Mockito.verify(serializer).serializeExtendedCommunity(Mockito.any(ExtendedCommunity.class), Mockito.any(ByteBuf.class)); + Mockito.verify(this.serializer).serializeExtendedCommunity(Mockito.any(ExtendedCommunity.class), Mockito.any(ByteBuf.class)); //no value serialized, just header Assert.assertEquals(2, output.readableBytes()); - final ExtendedCommunities parsedExtendedCommunity = register.parseExtendedCommunity(Unpooled.copiedBuffer(new byte[] {0, 0, 0, 0, 0, 0, 0, 0})); - Mockito.verify(parser).parseExtendedCommunity(Mockito.any(ByteBuf.class)); + final ExtendedCommunities parsedExtendedCommunity = this.register.parseExtendedCommunity(Unpooled.copiedBuffer(new byte[] {0, 0, 0, 0, 0, 0, 0, 0})); + Mockito.verify(this.parser).parseExtendedCommunity(Mockito.any(ByteBuf.class)); Assert.assertTrue(parsedExtendedCommunity.isTransitive()); //no value parser Assert.assertNull(parsedExtendedCommunity.getExtendedCommunity()); @@ -64,26 +64,26 @@ public class SimpleExtendedCommunityRegistryTest { @Test public void testExtendedCommunityRegistryUnknown() throws BGPDocumentedException, BGPParsingException { final ByteBuf output = Unpooled.buffer(); - register.serializeExtendedCommunity( + this.register.serializeExtendedCommunity( new ExtendedCommunitiesBuilder().setTransitive(false).setExtendedCommunity(new RouteOriginIpv4CaseBuilder().build()).build(), output); //no ex. community was serialized Assert.assertEquals(0, output.readableBytes()); - Mockito.verify(serializer, Mockito.never()).serializeExtendedCommunity(Mockito.any(ExtendedCommunity.class), Mockito.any(ByteBuf.class)); + Mockito.verify(this.serializer, Mockito.never()).serializeExtendedCommunity(Mockito.any(ExtendedCommunity.class), Mockito.any(ByteBuf.class)); - final ExtendedCommunities noExtCommunity = register.parseExtendedCommunity(Unpooled.copiedBuffer(new byte[] {0, 1, 0, 0, 0, 0, 0, 0})); + final ExtendedCommunities noExtCommunity = this.register.parseExtendedCommunity(Unpooled.copiedBuffer(new byte[] {0, 1, 0, 0, 0, 0, 0, 0})); //no ext. community was parsed Assert.assertNull(noExtCommunity); - Mockito.verify(parser, Mockito.never()).parseExtendedCommunity(Mockito.any(ByteBuf.class)); + Mockito.verify(this.parser, Mockito.never()).parseExtendedCommunity(Mockito.any(ByteBuf.class)); } @Test(expected=IllegalArgumentException.class) public void testRegisterParserOutOfRangeType() { - register.registerExtendedCommunityParser(1234, 0, parser); + this.register.registerExtendedCommunityParser(1234, 0, this.parser); } @Test(expected=IllegalArgumentException.class) public void testRegisterParserOutOfRangeSubType() { - register.registerExtendedCommunityParser(0, 1234, parser); + this.register.registerExtendedCommunityParser(0, 1234, this.parser); } } diff --git a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/OffsetMap.java b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/OffsetMap.java index 28d2a6fda7..ae57d35147 100644 --- a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/OffsetMap.java +++ b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/OffsetMap.java @@ -94,13 +94,13 @@ public final class OffsetMap { public T getValue(final T[] array, final int offset) { Preconditions.checkArgument(offset >= 0, NEGATIVEOFFSET, offset); - Preconditions.checkArgument(offset < routeKeys.length, INVALIDOFFSET, offset, routeKeys.length); + Preconditions.checkArgument(offset < this.routeKeys.length, INVALIDOFFSET, offset, this.routeKeys.length); return array[offset]; } public void setValue(final T[] array, final int offset, final T value) { Preconditions.checkArgument(offset >= 0, NEGATIVEOFFSET, offset); - Preconditions.checkArgument(offset < routeKeys.length, INVALIDOFFSET, offset, routeKeys.length); + Preconditions.checkArgument(offset < this.routeKeys.length, INVALIDOFFSET, offset, this.routeKeys.length); array[offset] = value; } @@ -118,7 +118,7 @@ public final class OffsetMap { public T[] removeValue(final T[] oldArray, final int offset) { final int length = oldArray.length; Preconditions.checkArgument(offset >= 0, NEGATIVEOFFSET, offset); - Preconditions.checkArgument(offset < routeKeys.length, INVALIDOFFSET, offset, length); + Preconditions.checkArgument(offset < this.routeKeys.length, INVALIDOFFSET, offset, length); final T[] ret = (T[]) Array.newInstance(oldArray.getClass().getComponentType(), length - 1); System.arraycopy(oldArray, 0, ret, 0, offset); diff --git a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/n/paths/AddPathBestNPathSelection.java b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/n/paths/AddPathBestNPathSelection.java index 5e05237bd9..96aed302ef 100644 --- a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/n/paths/AddPathBestNPathSelection.java +++ b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/n/paths/AddPathBestNPathSelection.java @@ -33,6 +33,6 @@ public class AddPathBestNPathSelection implements PathSelectionMode { } public Long getNBestPaths() { - return nBestPaths; + return this.nBestPaths; } } \ No newline at end of file diff --git a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/OffsetMap.java b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/OffsetMap.java index 63e8b7cee2..a07a0c29a1 100644 --- a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/OffsetMap.java +++ b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/OffsetMap.java @@ -98,13 +98,13 @@ final class OffsetMap { public T getValue(final T[] array, final int offset) { Preconditions.checkArgument(offset >= 0, NEGATIVEOFFSET, offset); - Preconditions.checkArgument(offset < routeKeys.length, INVALIDOFFSET, offset, routeKeys.length); + Preconditions.checkArgument(offset < this.routeKeys.length, INVALIDOFFSET, offset, this.routeKeys.length); return array[offset]; } public void setValue(final T[] array, final int offset, final T value) { Preconditions.checkArgument(offset >= 0, NEGATIVEOFFSET, offset); - Preconditions.checkArgument(offset < routeKeys.length, INVALIDOFFSET, offset, routeKeys.length); + Preconditions.checkArgument(offset < this.routeKeys.length, INVALIDOFFSET, offset, this.routeKeys.length); array[offset] = value; } @@ -122,7 +122,7 @@ final class OffsetMap { public T[] removeValue(final T[] oldArray, final int offset) { final int length = oldArray.length; Preconditions.checkArgument(offset >= 0, NEGATIVEOFFSET, offset); - Preconditions.checkArgument(offset < routeKeys.length, INVALIDOFFSET, offset, length); + Preconditions.checkArgument(offset < this.routeKeys.length, INVALIDOFFSET, offset, length); final T[] ret = (T[]) Array.newInstance(oldArray.getClass().getComponentType(), length - 1); System.arraycopy(oldArray, 0, ret, 0, offset); diff --git a/bgp/path-selection-mode/src/test/java/org/opendaylight/controller/config/yang/bgp/path/selection/mode/AdvertiseAllPathsModuleTest.java b/bgp/path-selection-mode/src/test/java/org/opendaylight/controller/config/yang/bgp/path/selection/mode/AdvertiseAllPathsModuleTest.java index 1323929872..31afc555f3 100644 --- a/bgp/path-selection-mode/src/test/java/org/opendaylight/controller/config/yang/bgp/path/selection/mode/AdvertiseAllPathsModuleTest.java +++ b/bgp/path-selection-mode/src/test/java/org/opendaylight/controller/config/yang/bgp/path/selection/mode/AdvertiseAllPathsModuleTest.java @@ -43,7 +43,7 @@ public class AdvertiseAllPathsModuleTest extends AbstractConfigTest { @Test public void testReconfigureInstance() throws Exception { createInstance(); - ConfigTransactionJMXClient transaction = configRegistryClient.createTransaction(); + ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction(); assertBeanCount(1, FACTORY_NAME); CommitStatus status = transaction.commit(); assertBeanCount(1, FACTORY_NAME); diff --git a/bgp/path-selection-mode/src/test/java/org/opendaylight/controller/config/yang/bgp/path/selection/mode/AdvertiseNPathsModuleTest.java b/bgp/path-selection-mode/src/test/java/org/opendaylight/controller/config/yang/bgp/path/selection/mode/AdvertiseNPathsModuleTest.java index b447a6294c..98df6234b4 100644 --- a/bgp/path-selection-mode/src/test/java/org/opendaylight/controller/config/yang/bgp/path/selection/mode/AdvertiseNPathsModuleTest.java +++ b/bgp/path-selection-mode/src/test/java/org/opendaylight/controller/config/yang/bgp/path/selection/mode/AdvertiseNPathsModuleTest.java @@ -43,7 +43,7 @@ public class AdvertiseNPathsModuleTest extends AbstractConfigTest { @Test public void testReconfigureInstance() throws Exception { createInstance(); - ConfigTransactionJMXClient transaction = configRegistryClient.createTransaction(); + ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction(); assertBeanCount(1, FACTORY_NAME); CommitStatus status = transaction.commit(); assertBeanCount(1, FACTORY_NAME); diff --git a/bgp/path-selection-mode/src/test/java/org/opendaylight/protocol/bgp/mode/impl/AbstractRouteEntryTest.java b/bgp/path-selection-mode/src/test/java/org/opendaylight/protocol/bgp/mode/impl/AbstractRouteEntryTest.java index ef3e648b01..d40a0a7159 100644 --- a/bgp/path-selection-mode/src/test/java/org/opendaylight/protocol/bgp/mode/impl/AbstractRouteEntryTest.java +++ b/bgp/path-selection-mode/src/test/java/org/opendaylight/protocol/bgp/mode/impl/AbstractRouteEntryTest.java @@ -114,16 +114,16 @@ public class AbstractRouteEntryTest { this.attributes = createAttr(); this.locRibTargetYii = LOC_RIB_TARGET.node(ROUTES_IDENTIFIER); this.locRibOutTargetYii = PEER_YII.node(AdjRibOut.QNAME).node(Tables.QNAME).node(RibSupportUtils.toYangTablesKey(TABLES_KEY)).node(ROUTES_IDENTIFIER); - this.routePaYii = locRibTargetYii.node(ROUTE_ID_PA); - this.routePaAddPathYii = locRibTargetYii.node(ROUTE_ID_PA_ADD_PATH); - this.routeRiboutYii = locRibOutTargetYii.node(ROUTE_ID_PA); - this.routeAddRiboutYii = locRibOutTargetYii.node(ROUTE_ID_PA_ADD_PATH); - this.routeRiboutAttYii = locRibOutTargetYii.node(ROUTE_ID_PA).node(ATTRS_EXTENSION_Q); - this.routeAddRiboutAttYii = locRibOutTargetYii.node(ROUTE_ID_PA_ADD_PATH).node(ATTRS_EXTENSION_Q); + this.routePaYii = this.locRibTargetYii.node(ROUTE_ID_PA); + this.routePaAddPathYii = this.locRibTargetYii.node(ROUTE_ID_PA_ADD_PATH); + this.routeRiboutYii = this.locRibOutTargetYii.node(ROUTE_ID_PA); + this.routeAddRiboutYii = this.locRibOutTargetYii.node(ROUTE_ID_PA_ADD_PATH); + this.routeRiboutAttYii = this.locRibOutTargetYii.node(ROUTE_ID_PA).node(ATTRS_EXTENSION_Q); + this.routeAddRiboutAttYii = this.locRibOutTargetYii.node(ROUTE_ID_PA_ADD_PATH).node(ATTRS_EXTENSION_Q); this.locRibOutTargetYiiPeer2 = PEER_YII2.node(AdjRibOut.QNAME).node(Tables.QNAME).node(RibSupportUtils.toYangTablesKey(TABLES_KEY)).node(ROUTES_IDENTIFIER); - this.routeRiboutYiiPeer2 = locRibOutTargetYiiPeer2.node(ROUTE_ID_PA); - this.routeRiboutAttYiiPeer2 = locRibOutTargetYiiPeer2.node(ROUTE_ID_PA).node(ATTRS_EXTENSION_Q); - this.routeAddRiboutYiiPeer2 = locRibOutTargetYiiPeer2.node(ROUTE_ID_PA_ADD_PATH); + this.routeRiboutYiiPeer2 = this.locRibOutTargetYiiPeer2.node(ROUTE_ID_PA); + this.routeRiboutAttYiiPeer2 = this.locRibOutTargetYiiPeer2.node(ROUTE_ID_PA).node(ATTRS_EXTENSION_Q); + this.routeAddRiboutYiiPeer2 = this.locRibOutTargetYiiPeer2.node(ROUTE_ID_PA_ADD_PATH); mockRibSupport(); mockExportPolicies(); mockExportGroup(); diff --git a/bgp/rib-api/src/main/java/org/opendaylight/protocol/bgp/rib/DefaultRibReference.java b/bgp/rib-api/src/main/java/org/opendaylight/protocol/bgp/rib/DefaultRibReference.java index b736a953ef..ad17a12cb5 100644 --- a/bgp/rib-api/src/main/java/org/opendaylight/protocol/bgp/rib/DefaultRibReference.java +++ b/bgp/rib-api/src/main/java/org/opendaylight/protocol/bgp/rib/DefaultRibReference.java @@ -24,6 +24,6 @@ public class DefaultRibReference implements RibReference { @Override public final KeyedInstanceIdentifier getInstanceIdentifier() { - return instanceIdentifier; + return this.instanceIdentifier; } } diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPDispatcherImplModule.java b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPDispatcherImplModule.java index 6866421bdc..e824aedf92 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPDispatcherImplModule.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPDispatcherImplModule.java @@ -47,7 +47,7 @@ public final class BGPDispatcherImplModule extends org.opendaylight.controller.c // The BGPDispatcher instance is created and advertised as an OSGi service via blueprint // so obtain it here (waiting if necessary). final WaitingServiceTracker tracker = - WaitingServiceTracker.create(BGPDispatcher.class, bundleContext); + WaitingServiceTracker.create(BGPDispatcher.class, this.bundleContext); final BGPDispatcher service = tracker.waitForService(WaitingServiceTracker.FIVE_MINUTES); // Create a proxy to override close to close the ServiceTracker. The actual BGPDispatcher diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractReflectingExportPolicy.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractReflectingExportPolicy.java index 6e5763def0..e732a382d7 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractReflectingExportPolicy.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractReflectingExportPolicy.java @@ -33,7 +33,7 @@ abstract class AbstractReflectingExportPolicy extends AbstractExportPolicy { * @return Modified (reflected) attributes. */ @Nonnull protected final ContainerNode reflectedAttributes(@Nonnull final ContainerNode attributes) { - return AttributeOperations.getInstance(attributes).reflectedAttributes(attributes, originatorId, clusterId); + return AttributeOperations.getInstance(attributes).reflectedAttributes(attributes, this.originatorId, this.clusterId); } /** diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/CachingImportPolicy.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/CachingImportPolicy.java index 57023aa28a..c9cfb93cc0 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/CachingImportPolicy.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/CachingImportPolicy.java @@ -76,15 +76,15 @@ final class CachingImportPolicy extends AbstractImportPolicy { * again. If the reference is the same, we have just populated the interner * and thus are on the path to create a new cache entry. */ - final ContainerNode interned = interner.intern(attributes); + final ContainerNode interned = this.interner.intern(attributes); if (interned != attributes) { - final ContainerNode retry = cache.get(interned); + final ContainerNode retry = this.cache.get(interned); if (retry != null) { return unmaskNull(retry); } } - final ContainerNode effective = delegate.effectiveAttributes(interned); + final ContainerNode effective = this.delegate.effectiveAttributes(interned); /* * Populate the cache. Note that this may have raced with another thread, @@ -94,7 +94,7 @@ final class CachingImportPolicy extends AbstractImportPolicy { * but that's fine, as they have not leaked to heap yet and will be GC'd * quickly. */ - final ContainerNode existing = cache.putIfAbsent(interned, maskNull(effective)); + final ContainerNode existing = this.cache.putIfAbsent(interned, maskNull(effective)); return existing != null ? unmaskNull(existing) : effective; } diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ExportPolicyPeerTrackerImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ExportPolicyPeerTrackerImpl.java index 4d5bbdbbb8..1807dfe11e 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ExportPolicyPeerTrackerImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ExportPolicyPeerTrackerImpl.java @@ -86,14 +86,14 @@ final class ExportPolicyPeerTrackerImpl implements ExportPolicyPeerTracker { @Override protected void removeRegistration() { synchronized (lock) { - final SendReceive sendReceiveValue = peerAddPathTables.remove(peerId); + final SendReceive sendReceiveValue = ExportPolicyPeerTrackerImpl.this.peerAddPathTables.remove(peerId); if (sendReceiveValue != null) { LOG.debug("Supported Add BestPath table {} removed to peer {}", sendReceiveValue, peerId); } - peerTables.remove(peerId); - LOG.debug("Removed peer {} from supported table {}", peerId, localTableKey); - peerRoles.remove(peerPath); - createGroups(peerRoles); + ExportPolicyPeerTrackerImpl.this.peerTables.remove(peerId); + LOG.debug("Removed peer {} from supported table {}", peerId, ExportPolicyPeerTrackerImpl.this.localTableKey); + ExportPolicyPeerTrackerImpl.this.peerRoles.remove(peerPath); + createGroups(ExportPolicyPeerTrackerImpl.this.peerRoles); } } }; diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/PeerExportGroupImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/PeerExportGroupImpl.java index 69ba399ce1..7a5b42f156 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/PeerExportGroupImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/PeerExportGroupImpl.java @@ -26,12 +26,12 @@ final class PeerExportGroupImpl implements PeerExportGroup { @Override public ContainerNode effectiveAttributes(final PeerRole role, final ContainerNode attributes) { - return attributes == null || role == null ? null : policy.effectiveAttributes(role, attributes); + return attributes == null || role == null ? null : this.policy.effectiveAttributes(role, attributes); } @Override public Collection> getPeers() { - return peers.entrySet(); + return this.peers.entrySet(); } @Override diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/PolicyDatabase.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/PolicyDatabase.java index a376928fc2..36d0f62e2c 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/PolicyDatabase.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/PolicyDatabase.java @@ -47,6 +47,6 @@ final class PolicyDatabase { * - ability to share resulting attributes across import policies * - ability to share resulting attributes with export policies */ - return new CachingImportPolicy(importPolicies.get(peerRole)); + return new CachingImportPolicy(this.importPolicies.get(peerRole)); } } diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RouteUpdateKey.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RouteUpdateKey.java index f0c3a257b3..7b6da1c296 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RouteUpdateKey.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RouteUpdateKey.java @@ -25,19 +25,19 @@ final class RouteUpdateKey { } PeerId getPeerId() { - return peerId; + return this.peerId; } PathArgument getRouteId() { - return routeId; + return this.routeId; } @Override public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + peerId.hashCode(); - result = prime * result + routeId.hashCode(); + result = prime * result + this.peerId.hashCode(); + result = prime * result + this.routeId.hashCode(); return result; } @@ -50,10 +50,10 @@ final class RouteUpdateKey { return false; } RouteUpdateKey other = (RouteUpdateKey) obj; - if (!peerId.equals(other.peerId)) { + if (!this.peerId.equals(other.peerId)) { return false; } - if (!routeId.equals(other.routeId)) { + if (!this.routeId.equals(other.routeId)) { return false; } return true; diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ToExternalExportPolicy.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ToExternalExportPolicy.java index 0bbcd81252..a5cf30e49b 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ToExternalExportPolicy.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ToExternalExportPolicy.java @@ -23,7 +23,7 @@ final class ToExternalExportPolicy extends AbstractExportPolicy { @Override ContainerNode effectiveAttributes(final PeerRole sourceRole, final ContainerNode attributes) { - final ContainerNode ret = AttributeOperations.getInstance(attributes).exportedAttributes(attributes, localAs); + final ContainerNode ret = AttributeOperations.getInstance(attributes).exportedAttributes(attributes, this.localAs); switch (sourceRole) { case Ebgp: diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/spi/RIBExtensionsImplModule.java b/bgp/rib-spi/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/spi/RIBExtensionsImplModule.java index b372b80bc3..142f1383a3 100644 --- a/bgp/rib-spi/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/spi/RIBExtensionsImplModule.java +++ b/bgp/rib-spi/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/spi/RIBExtensionsImplModule.java @@ -52,7 +52,7 @@ public final class RIBExtensionsImplModule extends org.opendaylight.controller.c // The RIBExtensionProviderContext instance is created and advertised as an OSGi service via blueprint // so obtain it here (waiting if necessary). final WaitingServiceTracker tracker = - WaitingServiceTracker.create(RIBExtensionProviderContext.class, bundleContext); + WaitingServiceTracker.create(RIBExtensionProviderContext.class, this.bundleContext); final RIBExtensionProviderContext service = tracker.waitForService(WaitingServiceTracker.FIVE_MINUTES); // Create a proxy to override close to close the ServiceTracker. The actual RIBExtensionProviderContext diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupport.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupport.java index e7708e1311..48d0f7c745 100644 --- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupport.java +++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupport.java @@ -144,13 +144,13 @@ public abstract class AbstractRIBSupport implements RIBSupport { @Nonnull @Override public final Class getAfi() { - return afiClass; + return this.afiClass; } @Nonnull @Override public final Class getSafi() { - return safiClass; + return this.safiClass; } /** diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/BGPTerminationReason.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/BGPTerminationReason.java index af9e2ca6cd..323993d539 100644 --- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/BGPTerminationReason.java +++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/BGPTerminationReason.java @@ -18,13 +18,13 @@ public final class BGPTerminationReason { } public String getErrorMessage() { - return error.toString(); + return this.error.toString(); } @Override public String toString() { return MoreObjects.toStringHelper(this) - .add("error", error) + .add("error", this.error) .toString(); } } diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/PeerExportGroup.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/PeerExportGroup.java index d8c538e0e7..ff7e91798d 100644 --- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/PeerExportGroup.java +++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/PeerExportGroup.java @@ -29,11 +29,11 @@ public interface PeerExportGroup { } public YangInstanceIdentifier getYii() { - return yii; + return this.yii; } public PeerRole getRole() { - return role; + return this.role; } } diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/ServiceLoaderRIBExtensionConsumerContext.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/ServiceLoaderRIBExtensionConsumerContext.java index 5a763bd9bb..98042ddc3c 100644 --- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/ServiceLoaderRIBExtensionConsumerContext.java +++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/ServiceLoaderRIBExtensionConsumerContext.java @@ -38,7 +38,7 @@ public final class ServiceLoaderRIBExtensionConsumerContext extends SimpleRIBExt @Override public void close() { - for (RIBExtensionProviderActivator a : loader) { + for (RIBExtensionProviderActivator a : this.loader) { try { a.stopRIBExtensionProvider(); } catch (RuntimeException e) { diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/SimpleRIBExtensionProviderContextActivator.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/SimpleRIBExtensionProviderContextActivator.java index 732320dae9..b149d0d730 100644 --- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/SimpleRIBExtensionProviderContextActivator.java +++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/SimpleRIBExtensionProviderContextActivator.java @@ -30,18 +30,18 @@ public final class SimpleRIBExtensionProviderContextActivator implements AutoClo } public void start() { - LOG.info("Starting {} RIBExtensionProviderActivator instances", extensionActivators.size()); + LOG.info("Starting {} RIBExtensionProviderActivator instances", this.extensionActivators.size()); - for(final RIBExtensionProviderActivator e : extensionActivators) { - e.startRIBExtensionProvider(providerContext); + for(final RIBExtensionProviderActivator e : this.extensionActivators) { + e.startRIBExtensionProvider(this.providerContext); } } @Override public void close() { - LOG.info("Stopping {} RIBExtensionProviderActivator instances", extensionActivators.size()); + LOG.info("Stopping {} RIBExtensionProviderActivator instances", this.extensionActivators.size()); - for(final RIBExtensionProviderActivator e : extensionActivators) { + for(final RIBExtensionProviderActivator e : this.extensionActivators) { e.stopRIBExtensionProvider(); } } diff --git a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RibSupportUtilsTest.java b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RibSupportUtilsTest.java index c1ba1705ce..07aa47e1ea 100644 --- a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RibSupportUtilsTest.java +++ b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RibSupportUtilsTest.java @@ -64,8 +64,8 @@ public class RibSupportUtilsTest { final Map m = p.getKeyValues(); assertFalse(m.isEmpty()); assertEquals(Tables.QNAME, p.getNodeType()); - assertTrue(m.containsValue(BindingReflections.findQName(AFI))); - assertTrue(m.containsValue(BindingReflections.findQName(SAFI))); + assertTrue(m.containsValue(BindingReflections.findQName(this.AFI))); + assertTrue(m.containsValue(BindingReflections.findQName(this.SAFI))); } @Test @@ -74,13 +74,13 @@ public class RibSupportUtilsTest { final Map m = p.getKeyValues(); assertFalse(m.isEmpty()); assertEquals(SupportedTables.QNAME, p.getNodeType()); - assertTrue(m.containsValue(BindingReflections.findQName(AFI))); - assertTrue(m.containsValue(BindingReflections.findQName(SAFI))); + assertTrue(m.containsValue(BindingReflections.findQName(this.AFI))); + assertTrue(m.containsValue(BindingReflections.findQName(this.SAFI))); } @Test public void toYangPathKey() { - final NodeIdentifierWithPredicates result = RibSupportUtils.toYangPathKey(SupportedTables.QNAME, AFI, SAFI); + final NodeIdentifierWithPredicates result = RibSupportUtils.toYangPathKey(SupportedTables.QNAME, this.AFI, this.SAFI); assertEquals(NII_PATH.toString(), result.toString()); } diff --git a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RouterIdsTest.java b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RouterIdsTest.java index 23d718596f..23d0d01bf1 100644 --- a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RouterIdsTest.java +++ b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RouterIdsTest.java @@ -22,21 +22,21 @@ public class RouterIdsTest { @Test public void testRouterIdForAddress() throws Exception { - assertEquals(unsignedRouterId, RouterIds.routerIdForAddress("42.42.42.42")); + assertEquals(this.unsignedRouterId, RouterIds.routerIdForAddress("42.42.42.42")); } @Test public void testRouterIdForPeerId() throws Exception { - assertEquals(unsignedRouterId, RouterIds.routerIdForPeerId(peerID)); + assertEquals(this.unsignedRouterId, RouterIds.routerIdForPeerId(this.peerID)); } @Test public void testCreatePeerId() throws Exception { - assertEquals(peerID, RouterIds.createPeerId(new Ipv4Address("42.42.42.42"))); + assertEquals(this.peerID, RouterIds.createPeerId(new Ipv4Address("42.42.42.42"))); } @Test public void testCreatePeerId1() throws Exception { - assertEquals(peerID, RouterIds.createPeerId(unsignedRouterId)); + assertEquals(this.peerID, RouterIds.createPeerId(this.unsignedRouterId)); } } \ No newline at end of file diff --git a/concepts/src/main/java/org/opendaylight/protocol/concepts/AbstractRegistration.java b/concepts/src/main/java/org/opendaylight/protocol/concepts/AbstractRegistration.java index 7a34fdac2f..9f41a110e9 100644 --- a/concepts/src/main/java/org/opendaylight/protocol/concepts/AbstractRegistration.java +++ b/concepts/src/main/java/org/opendaylight/protocol/concepts/AbstractRegistration.java @@ -27,8 +27,8 @@ public abstract class AbstractRegistration implements AutoCloseable { @Override public final synchronized void close() { - if (!closed) { - closed = true; + if (!this.closed) { + this.closed = true; removeRegistration(); } } diff --git a/concepts/src/main/java/org/opendaylight/protocol/concepts/DefaultInstanceReference.java b/concepts/src/main/java/org/opendaylight/protocol/concepts/DefaultInstanceReference.java index c88445196b..766af9efa4 100644 --- a/concepts/src/main/java/org/opendaylight/protocol/concepts/DefaultInstanceReference.java +++ b/concepts/src/main/java/org/opendaylight/protocol/concepts/DefaultInstanceReference.java @@ -24,6 +24,6 @@ public class DefaultInstanceReference implements InstanceR @Override public final InstanceIdentifier getInstanceIdentifier() { - return instanceIdentifier; + return this.instanceIdentifier; } } diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/AbstractPcepOsgiTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/AbstractPcepOsgiTest.java index 4b3fc6d864..1222f94e59 100644 --- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/AbstractPcepOsgiTest.java +++ b/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/AbstractPcepOsgiTest.java @@ -26,12 +26,12 @@ public class AbstractPcepOsgiTest extends AbstractMdsalTestBase { BindingAwareBroker broker = null; public BindingAwareBroker getBroker() { - if (broker == null) { - ServiceReference serviceReference = bundleContext.getServiceReference(BindingAwareBroker.class); + if (this.broker == null) { + ServiceReference serviceReference = this.bundleContext.getServiceReference(BindingAwareBroker.class); if (serviceReference == null) { throw new RuntimeException("BindingAwareBroker not found"); } - broker = bundleContext.getService(serviceReference); + this.broker = this.bundleContext.getService(serviceReference); } return this.broker; } diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/PcepRpcServicesRoutingTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/PcepRpcServicesRoutingTest.java index 04b89b2f77..bb26de7c2d 100644 --- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/PcepRpcServicesRoutingTest.java +++ b/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/PcepRpcServicesRoutingTest.java @@ -137,7 +137,7 @@ public class PcepRpcServicesRoutingTest extends AbstractPcepOsgiTest { } }; - broker.registerProvider(provider1); + this.broker.registerProvider(provider1); final InstanceIdentifier topology2 = InstanceIdentifier.builder(NetworkTopology.class).child(Topology.class, new TopologyKey(getTopologyId("Topo2"))).build(); @@ -153,7 +153,7 @@ public class PcepRpcServicesRoutingTest extends AbstractPcepOsgiTest { } }; - broker.registerProvider(provider2); + this.broker.registerProvider(provider2); final BindingAwareConsumer consumer = new BindingAwareConsumer() { @Override @@ -217,7 +217,7 @@ public class PcepRpcServicesRoutingTest extends AbstractPcepOsgiTest { verify(pcepService2).ensureLspOperational(ensureInput); } }; - broker.registerConsumer(consumer); + this.broker.registerConsumer(consumer); } @SuppressWarnings("unchecked") @@ -260,7 +260,7 @@ public class PcepRpcServicesRoutingTest extends AbstractPcepOsgiTest { } }; - broker.registerProvider(provider1); + this.broker.registerProvider(provider1); final InstanceIdentifier topology2 = InstanceIdentifier.builder(NetworkTopology.class).child(Topology.class, new TopologyKey(getTopologyId("Topo2"))).build(); @@ -275,7 +275,7 @@ public class PcepRpcServicesRoutingTest extends AbstractPcepOsgiTest { } }; - broker.registerProvider(provider2); + this.broker.registerProvider(provider2); final BindingAwareConsumer consumer = new BindingAwareConsumer() { @Override @@ -340,7 +340,7 @@ public class PcepRpcServicesRoutingTest extends AbstractPcepOsgiTest { verify(pcepService2).submitTriggerSync(submitTriggerSyncInput); } }; - broker.registerConsumer(consumer); + this.broker.registerConsumer(consumer); } @SuppressWarnings("unchecked") @@ -381,7 +381,7 @@ public class PcepRpcServicesRoutingTest extends AbstractPcepOsgiTest { } }; - broker.registerProvider(provider1); + this.broker.registerProvider(provider1); final InstanceIdentifier topology2 = InstanceIdentifier.builder(NetworkTopology.class).child(Topology.class, new TopologyKey(getTopologyId("Topo2"))).build(); @@ -396,7 +396,7 @@ public class PcepRpcServicesRoutingTest extends AbstractPcepOsgiTest { } }; - broker.registerProvider(provider2); + this.broker.registerProvider(provider2); final BindingAwareConsumer consumer = new BindingAwareConsumer() { @Override @@ -443,7 +443,7 @@ public class PcepRpcServicesRoutingTest extends AbstractPcepOsgiTest { verify(pcepService2).pcepDestroyTunnel(addLspInput); } }; - broker.registerConsumer(consumer); + this.broker.registerConsumer(consumer); } private void initMock(final TopologyTunnelPcepProgrammingService pcepService) { diff --git a/pcep/impl/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModule.java b/pcep/impl/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModule.java index 36f0ab79fe..74b26a3e1b 100644 --- a/pcep/impl/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModule.java +++ b/pcep/impl/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModule.java @@ -44,7 +44,7 @@ public final class PCEPDispatcherImplModule extends AbstractPCEPDispatcherImplMo @Override public AutoCloseable createInstance() { final WaitingServiceTracker tracker = - WaitingServiceTracker.create(PCEPDispatcher.class, bundleContext); + WaitingServiceTracker.create(PCEPDispatcher.class, this.bundleContext); final PCEPDispatcher service = tracker.waitForService(WaitingServiceTracker.FIVE_MINUTES); return Reflection.newProxy(AutoCloseablePCEPDispatcher.class, new AbstractInvocationHandler() { diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/AbstractPCEPSessionNegotiator.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/AbstractPCEPSessionNegotiator.java index af933e15c6..508e2c18b7 100644 --- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/AbstractPCEPSessionNegotiator.java +++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/AbstractPCEPSessionNegotiator.java @@ -189,7 +189,7 @@ public abstract class AbstractPCEPSessionNegotiator extends AbstractSessionNegot } private void cancelTimers() { - failTimer.cancel(false); + this.failTimer.cancel(false); } private void startNegotiationWithOpen() { diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPHandlerFactory.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPHandlerFactory.java index 475b7227aa..7768f373f8 100644 --- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPHandlerFactory.java +++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPHandlerFactory.java @@ -31,6 +31,6 @@ public final class PCEPHandlerFactory { } public ChannelHandler[] getDecoders() { - return new ChannelHandler[] { new PCEPMessageHeaderDecoder(), new PCEPByteToMessageDecoder(registry), }; + return new ChannelHandler[] { new PCEPMessageHeaderDecoder(), new PCEPByteToMessageDecoder(this.registry), }; } } diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/AbstractPCEPSessionTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/AbstractPCEPSessionTest.java index 933ffac672..c65164e22f 100644 --- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/AbstractPCEPSessionTest.java +++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/AbstractPCEPSessionTest.java @@ -100,8 +100,8 @@ public class AbstractPCEPSessionTest { doReturn(this.pipeline).when(this.pipeline).addFirst(any(ChannelHandler.class)); doReturn(true).when(this.channel).isActive(); doReturn(mock(ChannelFuture.class)).when(this.channel).close(); - doReturn(new InetSocketAddress(ipAddress, port)).when(this.channel).remoteAddress(); - doReturn(new InetSocketAddress(ipAddress, port)).when(this.channel).localAddress(); + doReturn(new InetSocketAddress(this.ipAddress, this.port)).when(this.channel).remoteAddress(); + doReturn(new InetSocketAddress(this.ipAddress, this.port)).when(this.channel).localAddress(); this.openMsg = new OpenBuilder().setOpenMessage( new OpenMessageBuilder().setOpen( new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.open.object.OpenBuilder().setDeadTimer( diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImplTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImplTest.java index 29677fd23b..8eccb4b8e4 100644 --- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImplTest.java +++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImplTest.java @@ -112,14 +112,14 @@ public class PCEPSessionImplTest extends AbstractPCEPSessionTest { @Test public void testSessionStatistics() { this.session.handleMessage(Util.createErrorMessage(PCEPErrors.LSP_RSVP_ERROR, null)); - Assert.assertEquals(ipAddress, this.session.getPeerPref().getIpAddress()); + Assert.assertEquals(this.ipAddress, this.session.getPeerPref().getIpAddress()); final PeerPref peerPref = this.session.getPeerPref(); - Assert.assertEquals(ipAddress, peerPref.getIpAddress()); + Assert.assertEquals(this.ipAddress, peerPref.getIpAddress()); Assert.assertEquals(DEADTIMER, peerPref.getDeadtimer().shortValue()); Assert.assertEquals(KEEP_ALIVE, peerPref.getKeepalive().shortValue()); Assert.assertEquals(0, peerPref.getSessionId().intValue()); final LocalPref localPref = this.session.getLocalPref(); - Assert.assertEquals(ipAddress, localPref.getIpAddress()); + Assert.assertEquals(this.ipAddress, localPref.getIpAddress()); Assert.assertEquals(DEADTIMER, localPref.getDeadtimer().shortValue()); Assert.assertEquals(KEEP_ALIVE, localPref.getKeepalive().shortValue()); Assert.assertEquals(0, localPref.getSessionId().intValue()); diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPValidatorTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPValidatorTest.java index dece9115ec..e654d3ac52 100644 --- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPValidatorTest.java +++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPValidatorTest.java @@ -735,7 +735,7 @@ public class PCEPValidatorTest { rBuilder = new RepliesBuilder(); rBuilder.setRp(this.rpTrue); rBuilder.setMonitoring(this.monitoring); - rBuilder.setPccIdReq(pccIdReq); + rBuilder.setPccIdReq(this.pccIdReq); rBuilder.setMetricPce(Lists.newArrayList(new MetricPceBuilder().setPceId(this.pceId).build())); final List paths = Lists.newArrayList(); final PathsBuilder paBuilder = new PathsBuilder(); diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/TestVendorInformationTlvParser.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/TestVendorInformationTlvParser.java index cd8eadd453..61209af041 100644 --- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/TestVendorInformationTlvParser.java +++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/TestVendorInformationTlvParser.java @@ -47,7 +47,7 @@ public class TestVendorInformationTlvParser extends AbstractVendorInformationTlv } public int getValue() { - return value; + return this.value; } @Override @@ -59,7 +59,7 @@ public class TestVendorInformationTlvParser extends AbstractVendorInformationTlv public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + value; + result = prime * result + this.value; return result; } @@ -75,7 +75,7 @@ public class TestVendorInformationTlvParser extends AbstractVendorInformationTlv return false; } TestEnterpriseSpecificInformation other = (TestEnterpriseSpecificInformation) obj; - if (value != other.value) { + if (this.value != other.value) { return false; } return true; diff --git a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCSyncOptimization.java b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCSyncOptimization.java index 5d4ce11e81..40f224b031 100644 --- a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCSyncOptimization.java +++ b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCSyncOptimization.java @@ -36,7 +36,7 @@ final class PCCSyncOptimization { final Tlvs local = session.localSessionCharacteristics(); this.localLspDbVersion = getLspDbVersion(local); this.remoteLspDbVersion = getLspDbVersion(remote); - this.dbVersionMatch = compareLspDbVersion(localLspDbVersion, remoteLspDbVersion); + this.dbVersionMatch = compareLspDbVersion(this.localLspDbVersion, this.remoteLspDbVersion); this.isSyncAvoidanceEnabled = isSyncAvoidance(local) && isSyncAvoidance(remote); this.isDeltaSyncEnabled = isDeltaSync(local) && isDeltaSync(remote); this.isTriggeredInitialSynEnable = isTriggeredInitialSync(local) && isTriggeredInitialSync(remote) && @@ -45,23 +45,23 @@ final class PCCSyncOptimization { } public boolean doesLspDbMatch() { - return dbVersionMatch; + return this.dbVersionMatch; } public boolean isSyncAvoidanceEnabled() { - return isSyncAvoidanceEnabled; + return this.isSyncAvoidanceEnabled; } public boolean isDeltaSyncEnabled() { - return isDeltaSyncEnabled; + return this.isDeltaSyncEnabled; } public boolean isTriggeredInitSyncEnabled() { - return isTriggeredInitialSynEnable; + return this.isTriggeredInitialSynEnable; } public boolean isTriggeredReSyncEnabled() { - return isTriggeredReSyncEnable; + return this.isTriggeredReSyncEnable; } public BigInteger getLocalLspDbVersionValue() { diff --git a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCsBuilder.java b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCsBuilder.java index 6482849503..e43b7b9c6b 100644 --- a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCsBuilder.java +++ b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCsBuilder.java @@ -81,7 +81,7 @@ final class PCCsBuilder { for (int i = 0; i < this.pccCount; i++) { final PCCTunnelManager tunnelManager = new PCCTunnelManagerImpl(this.lsps, currentAddress, this.redelegationTimeout, this.stateTimeout, this.timer, timerHandler); - createPCC(new InetSocketAddress(currentAddress, localAddress.getPort()), tunnelManager, initialDBVersion); + createPCC(new InetSocketAddress(currentAddress, this.localAddress.getPort()), tunnelManager, initialDBVersion); currentAddress = InetAddresses.increment(currentAddress); } } @@ -91,8 +91,8 @@ final class PCCsBuilder { final PCEPSessionNegotiatorFactory snf = getSessionNegotiatorFactory(); for (final InetSocketAddress pceAddress : this.remoteAddress) { this.pccDispatcher.createClient(pceAddress, this.reconnectTime, () -> new PCCSessionListener( - remoteAddress.indexOf(pceAddress), tunnelManager, pcError), snf, - KeyMapping.getKeyMapping(pceAddress.getAddress(), password), localAddress, initialDBVersion); + this.remoteAddress.indexOf(pceAddress), tunnelManager, this.pcError), snf, + KeyMapping.getKeyMapping(pceAddress.getAddress(), this.password), localAddress, initialDBVersion); } } diff --git a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/TimerHandler.java b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/TimerHandler.java index 1c5ec5ef04..f48768e4c3 100644 --- a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/TimerHandler.java +++ b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/TimerHandler.java @@ -38,10 +38,10 @@ public class TimerHandler { final class DisconnectTask implements TimerTask { @Override public void run(final Timeout timeout) throws Exception { - LOG.debug("Disconnects PCCs, reconnect after {} seconds", reconnectAfter); - pccDispatcher.close(); - if (reconnectAfter > 0) { - timer.newTimeout(new ReconnectTask(), reconnectAfter, TimeUnit.SECONDS); + LOG.debug("Disconnects PCCs, reconnect after {} seconds", TimerHandler.this.reconnectAfter); + TimerHandler.this.pccDispatcher.close(); + if (TimerHandler.this.reconnectAfter > 0) { + TimerHandler.this.timer.newTimeout(new ReconnectTask(), TimerHandler.this.reconnectAfter, TimeUnit.SECONDS); } } } @@ -50,14 +50,14 @@ public class TimerHandler { @Override public void run(final Timeout timeout) throws Exception { LOG.debug("Reconnecting PCCs}"); - pcCsBuilder.createPCCs(syncOptDBVersion.isPresent() ? syncOptDBVersion.get() : BigInteger.ONE, Optional.absent()); + TimerHandler.this.pcCsBuilder.createPCCs(TimerHandler.this.syncOptDBVersion.isPresent() ? TimerHandler.this.syncOptDBVersion.get() : BigInteger.ONE, Optional.absent()); } } protected void createDisconnectTask() { - if (this.disconnectAfter > 0 && !reconnectActive && syncOptDBVersion.isPresent()) { - timer.newTimeout(new DisconnectTask(), this.disconnectAfter, TimeUnit.SECONDS); - reconnectActive = true; + if (this.disconnectAfter > 0 && !this.reconnectActive && this.syncOptDBVersion.isPresent()) { + this.timer.newTimeout(new DisconnectTask(), this.disconnectAfter, TimeUnit.SECONDS); + this.reconnectActive = true; } } diff --git a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCServerPeerProposal.java b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCServerPeerProposal.java index 8995208d30..05bf2efa0a 100644 --- a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCServerPeerProposal.java +++ b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCServerPeerProposal.java @@ -29,10 +29,10 @@ public class PCCServerPeerProposal implements PCEPPeerProposal { public void setPeerSpecificProposal(@Nonnull final InetSocketAddress address, @Nonnull final TlvsBuilder openBuilder) { Preconditions.checkNotNull(address); final LspDbVersionBuilder lspDbVersionBuilder = new LspDbVersionBuilder(); - if (isAfterReconnection) { + if (this.isAfterReconnection) { lspDbVersionBuilder.setLspDbVersionValue(this.dbVersion); } else { - isAfterReconnection = true; + this.isAfterReconnection = true; } openBuilder.addAugmentation(Tlvs3.class, new Tlvs3Builder().setLspDbVersion(lspDbVersionBuilder.build()).build()); } diff --git a/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing/SrEroSubobjectParser.java b/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing/SrEroSubobjectParser.java index b4e2cf7175..bf4376b672 100644 --- a/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing/SrEroSubobjectParser.java +++ b/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing/SrEroSubobjectParser.java @@ -37,7 +37,7 @@ public class SrEroSubobjectParser extends AbstractSrSubobjectParser implements E final SrSubobject srSubobject = (SrSubobject) subobject.getSubobjectType(); final ByteBuf body = serializeSubobject(srSubobject); - EROSubobjectUtil.formatSubobject(type, subobject.isLoose(), body, buffer); + EROSubobjectUtil.formatSubobject(this.type, subobject.isLoose(), body, buffer); } @Override diff --git a/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing/SrRroSubobjectParser.java b/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing/SrRroSubobjectParser.java index 3830cb6fdf..24cf22fc0b 100644 --- a/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing/SrRroSubobjectParser.java +++ b/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing/SrRroSubobjectParser.java @@ -38,7 +38,7 @@ public class SrRroSubobjectParser extends AbstractSrSubobjectParser implements R .getClass()); final SrSubobject srSubobject = (SrSubobject) subobject.getSubobjectType(); final ByteBuf body = serializeSubobject(srSubobject); - RROSubobjectUtil.formatSubobject(type, body, buffer); + RROSubobjectUtil.formatSubobject(this.type, body, buffer); } @Override diff --git a/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/SrEroSubobjectParserTest.java b/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/SrEroSubobjectParserTest.java index 3a927e5b1b..d78e8e94ef 100644 --- a/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/SrEroSubobjectParserTest.java +++ b/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/SrEroSubobjectParserTest.java @@ -105,7 +105,7 @@ public class SrEroSubobjectParserTest { this.act = new SegmentRoutingActivator(); this.act.start(this.ctx); final boolean isIanaAssignedType = false; - parser = new SrEroSubobjectParser(isIanaAssignedType); + this.parser = new SrEroSubobjectParser(isIanaAssignedType); } @Test @@ -118,9 +118,9 @@ public class SrEroSubobjectParserTest { builder.setNai(new IpNodeIdBuilder().setIpAddress(new IpAddress(new Ipv4Address("74.125.43.99"))).build()); final SubobjectBuilder subobjBuilder = new SubobjectBuilder().setSubobjectType(builder.build()).setLoose(false); - assertEquals(subobjBuilder.build(), parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(srEroSubobjectWithIpv4NodeID, 2)), false)); + assertEquals(subobjBuilder.build(), this.parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(srEroSubobjectWithIpv4NodeID, 2)), false)); final ByteBuf buffer = Unpooled.buffer(); - parser.serializeSubobject(subobjBuilder.build(), buffer); + this.parser.serializeSubobject(subobjBuilder.build(), buffer); assertArrayEquals(srEroSubobjectWithIpv4NodeID, ByteArray.getAllBytes(buffer)); } @@ -134,9 +134,9 @@ public class SrEroSubobjectParserTest { builder.setNai(new IpNodeIdBuilder().setIpAddress(new IpAddress(new Ipv6Address("fe80:cd00::211e:729c"))).build()); final SubobjectBuilder subobjBuilder = new SubobjectBuilder().setSubobjectType(builder.build()).setLoose(false); - assertEquals(subobjBuilder.build(), parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(srEroSubobjectWithIpv6NodeID, 2)), false)); + assertEquals(subobjBuilder.build(), this.parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(srEroSubobjectWithIpv6NodeID, 2)), false)); final ByteBuf buffer = Unpooled.buffer(); - parser.serializeSubobject(subobjBuilder.build(), buffer); + this.parser.serializeSubobject(subobjBuilder.build(), buffer); assertArrayEquals(srEroSubobjectWithIpv6NodeID, ByteArray.getAllBytes(buffer)); } @@ -151,9 +151,9 @@ public class SrEroSubobjectParserTest { .setRemoteIpAddress(new IpAddress(new Ipv4Address("74.125.43.100"))).build()); final SubobjectBuilder subobjBuilder = new SubobjectBuilder().setSubobjectType(builder.build()).setLoose(false); - assertEquals(subobjBuilder.build(), parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(srEroSubobjectWithIpv4Adjacency, 2)), false)); + assertEquals(subobjBuilder.build(), this.parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(srEroSubobjectWithIpv4Adjacency, 2)), false)); final ByteBuf buffer = Unpooled.buffer(); - parser.serializeSubobject(subobjBuilder.build(), buffer); + this.parser.serializeSubobject(subobjBuilder.build(), buffer); assertArrayEquals(srEroSubobjectWithIpv4Adjacency, ByteArray.getAllBytes(buffer)); } @@ -168,9 +168,9 @@ public class SrEroSubobjectParserTest { .setRemoteIpAddress(new IpAddress(new Ipv6Address("fe80:cd00::211e:729d"))).build()); final SubobjectBuilder subobjBuilder = new SubobjectBuilder().setSubobjectType(builder.build()).setLoose(false); - assertEquals(subobjBuilder.build(), parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(srEroSubobjectWithIpv6Adjacency, 2)), false)); + assertEquals(subobjBuilder.build(), this.parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(srEroSubobjectWithIpv6Adjacency, 2)), false)); final ByteBuf buffer = Unpooled.buffer(); - parser.serializeSubobject(subobjBuilder.build(), buffer); + this.parser.serializeSubobject(subobjBuilder.build(), buffer); assertArrayEquals(srEroSubobjectWithIpv6Adjacency, ByteArray.getAllBytes(buffer)); } @@ -184,9 +184,9 @@ public class SrEroSubobjectParserTest { builder.setNai(new UnnumberedAdjacencyBuilder().setLocalNodeId(1L).setLocalInterfaceId(2L).setRemoteNodeId(3L).setRemoteInterfaceId(4L).build()); final SubobjectBuilder subobjBuilder = new SubobjectBuilder().setSubobjectType(builder.build()).setLoose(false); - assertEquals(subobjBuilder.build(), parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(srEroSubobjectWithUnnumbered, 2)), false)); + assertEquals(subobjBuilder.build(), this.parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(srEroSubobjectWithUnnumbered, 2)), false)); final ByteBuf buffer = Unpooled.buffer(); - parser.serializeSubobject(subobjBuilder.build(), buffer); + this.parser.serializeSubobject(subobjBuilder.build(), buffer); assertArrayEquals(srEroSubobjectWithUnnumbered, ByteArray.getAllBytes(buffer)); } @@ -199,9 +199,9 @@ public class SrEroSubobjectParserTest { builder.setMFlag(false); final SubobjectBuilder subobjBuilder = new SubobjectBuilder().setSubobjectType(builder.build()).setLoose(false); - assertEquals(subobjBuilder.build(), parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(srEroSubobjectWithoutNAI, 2)), false)); + assertEquals(subobjBuilder.build(), this.parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(srEroSubobjectWithoutNAI, 2)), false)); final ByteBuf buffer = Unpooled.buffer(); - parser.serializeSubobject(subobjBuilder.build(), buffer); + this.parser.serializeSubobject(subobjBuilder.build(), buffer); assertArrayEquals(srEroSubobjectWithoutNAI, ByteArray.getAllBytes(buffer)); } @@ -214,9 +214,9 @@ public class SrEroSubobjectParserTest { builder.setNai(new IpNodeIdBuilder().setIpAddress(new IpAddress(new Ipv4Address("74.125.43.99"))).build()); final SubobjectBuilder subobjBuilder = new SubobjectBuilder().setSubobjectType(builder.build()).setLoose(false); - assertEquals(subobjBuilder.build(), parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(srEroSubobjectWithoutSID, 2)), false)); + assertEquals(subobjBuilder.build(), this.parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(srEroSubobjectWithoutSID, 2)), false)); final ByteBuf buffer = Unpooled.buffer(); - parser.serializeSubobject(subobjBuilder.build(), buffer); + this.parser.serializeSubobject(subobjBuilder.build(), buffer); assertArrayEquals(srEroSubobjectWithoutSID, ByteArray.getAllBytes(buffer)); } @@ -230,9 +230,9 @@ public class SrEroSubobjectParserTest { builder.setNai(new IpNodeIdBuilder().setIpAddress(new IpAddress(new Ipv4Address("74.125.43.99"))).build()); final SubobjectBuilder subobjBuilder = new SubobjectBuilder().setSubobjectType(builder.build()).setLoose(false); - assertEquals(subobjBuilder.build(), parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(srEroSubobjectWithIpv4NodeIDMFlag, 2)), false)); + assertEquals(subobjBuilder.build(), this.parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(srEroSubobjectWithIpv4NodeIDMFlag, 2)), false)); final ByteBuf buffer = Unpooled.buffer(); - parser.serializeSubobject(subobjBuilder.build(), buffer); + this.parser.serializeSubobject(subobjBuilder.build(), buffer); assertArrayEquals(srEroSubobjectWithIpv4NodeIDMFlagAfter, ByteArray.getAllBytes(buffer)); } } diff --git a/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/SrRroSubobjectParserTest.java b/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/SrRroSubobjectParserTest.java index 38d4ff6c09..a9a7afa870 100644 --- a/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/SrRroSubobjectParserTest.java +++ b/pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/SrRroSubobjectParserTest.java @@ -94,8 +94,8 @@ public class SrRroSubobjectParserTest { this.ctx = new SimplePCEPExtensionProviderContext(); this.act = new SegmentRoutingActivator(); this.act.start(this.ctx); - isIanaAssignedType = false; - parser = new SrRroSubobjectParser(isIanaAssignedType); + this.isIanaAssignedType = false; + this.parser = new SrRroSubobjectParser(this.isIanaAssignedType); } @Test @@ -108,9 +108,9 @@ public class SrRroSubobjectParserTest { builder.setNai(new IpNodeIdBuilder().setIpAddress(new IpAddress(new Ipv4Address("74.125.43.99"))).build()); final SubobjectBuilder subobjBuilder = new SubobjectBuilder().setSubobjectType(builder.build()); - assertEquals(subobjBuilder.build(), parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(srRroSubobjectWithIpv4NodeID, 2)))); + assertEquals(subobjBuilder.build(), this.parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(srRroSubobjectWithIpv4NodeID, 2)))); final ByteBuf buffer = Unpooled.buffer(); - parser.serializeSubobject(subobjBuilder.build(), buffer); + this.parser.serializeSubobject(subobjBuilder.build(), buffer); assertArrayEquals(srRroSubobjectWithIpv4NodeID, ByteArray.getAllBytes(buffer)); } @@ -124,9 +124,9 @@ public class SrRroSubobjectParserTest { builder.setNai(new IpNodeIdBuilder().setIpAddress(new IpAddress(new Ipv6Address("fe80:cd00::211e:729c"))).build()); final SubobjectBuilder subobjBuilder = new SubobjectBuilder().setSubobjectType(builder.build()); - assertEquals(subobjBuilder.build(), parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(srRroSubobjectWithIpv6NodeID, 2)))); + assertEquals(subobjBuilder.build(), this.parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(srRroSubobjectWithIpv6NodeID, 2)))); final ByteBuf buffer = Unpooled.buffer(); - parser.serializeSubobject(subobjBuilder.build(), buffer); + this.parser.serializeSubobject(subobjBuilder.build(), buffer); assertArrayEquals(srRroSubobjectWithIpv6NodeID, ByteArray.getAllBytes(buffer)); } @@ -141,9 +141,9 @@ public class SrRroSubobjectParserTest { .setRemoteIpAddress(new IpAddress(new Ipv4Address("74.125.43.100"))).build()); final SubobjectBuilder subobjBuilder = new SubobjectBuilder().setSubobjectType(builder.build()); - assertEquals(subobjBuilder.build(), parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(srRroSubobjectWithIpv4Adjacency, 2)))); + assertEquals(subobjBuilder.build(), this.parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(srRroSubobjectWithIpv4Adjacency, 2)))); final ByteBuf buffer = Unpooled.buffer(); - parser.serializeSubobject(subobjBuilder.build(), buffer); + this.parser.serializeSubobject(subobjBuilder.build(), buffer); assertArrayEquals(srRroSubobjectWithIpv4Adjacency, ByteArray.getAllBytes(buffer)); } @@ -158,9 +158,9 @@ public class SrRroSubobjectParserTest { .setRemoteIpAddress(new IpAddress(new Ipv6Address("fe80:cd00::211e:729d"))).build()); final SubobjectBuilder subobjBuilder = new SubobjectBuilder().setSubobjectType(builder.build()); - assertEquals(subobjBuilder.build(), parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(srRroSubobjectWithIpv6Adjacency, 2)))); + assertEquals(subobjBuilder.build(), this.parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(srRroSubobjectWithIpv6Adjacency, 2)))); final ByteBuf buffer = Unpooled.buffer(); - parser.serializeSubobject(subobjBuilder.build(), buffer); + this.parser.serializeSubobject(subobjBuilder.build(), buffer); assertArrayEquals(srRroSubobjectWithIpv6Adjacency, ByteArray.getAllBytes(buffer)); } @@ -174,9 +174,9 @@ public class SrRroSubobjectParserTest { builder.setNai(new UnnumberedAdjacencyBuilder().setLocalNodeId(1L).setLocalInterfaceId(2L).setRemoteNodeId(3L).setRemoteInterfaceId(4L).build()); final SubobjectBuilder subobjBuilder = new SubobjectBuilder().setSubobjectType(builder.build()); - assertEquals(subobjBuilder.build(), parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(srRroSubobjectWithUnnumbered, 2)))); + assertEquals(subobjBuilder.build(), this.parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(srRroSubobjectWithUnnumbered, 2)))); final ByteBuf buffer = Unpooled.buffer(); - parser.serializeSubobject(subobjBuilder.build(), buffer); + this.parser.serializeSubobject(subobjBuilder.build(), buffer); assertArrayEquals(srRroSubobjectWithUnnumbered, ByteArray.getAllBytes(buffer)); } @@ -189,9 +189,9 @@ public class SrRroSubobjectParserTest { builder.setMFlag(true); final SubobjectBuilder subobjBuilder = new SubobjectBuilder().setSubobjectType(builder.build()); - assertEquals(subobjBuilder.build(), parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(srRroSubobjectWithoutNAI, 2)))); + assertEquals(subobjBuilder.build(), this.parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(srRroSubobjectWithoutNAI, 2)))); final ByteBuf buffer = Unpooled.buffer(); - parser.serializeSubobject(subobjBuilder.build(), buffer); + this.parser.serializeSubobject(subobjBuilder.build(), buffer); assertArrayEquals(srRroSubobjectWithoutNAI, ByteArray.getAllBytes(buffer)); } @@ -204,9 +204,9 @@ public class SrRroSubobjectParserTest { builder.setNai(new IpNodeIdBuilder().setIpAddress(new IpAddress(new Ipv4Address("74.125.43.99"))).build()); final SubobjectBuilder subobjBuilder = new SubobjectBuilder().setSubobjectType(builder.build()); - assertEquals(subobjBuilder.build(), parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(srRroSubobjectWithoutSID, 2)))); + assertEquals(subobjBuilder.build(), this.parser.parseSubobject(Unpooled.wrappedBuffer(ByteArray.cutBytes(srRroSubobjectWithoutSID, 2)))); final ByteBuf buffer = Unpooled.buffer(); - parser.serializeSubobject(subobjBuilder.build(), buffer); + this.parser.serializeSubobject(subobjBuilder.build(), buffer); assertArrayEquals(srRroSubobjectWithoutSID, ByteArray.getAllBytes(buffer)); } } diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimplePCEPExtensionProviderContextActivator.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimplePCEPExtensionProviderContextActivator.java index 829331d9a6..4c67b8e9f5 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimplePCEPExtensionProviderContextActivator.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimplePCEPExtensionProviderContextActivator.java @@ -32,18 +32,18 @@ public class SimplePCEPExtensionProviderContextActivator implements AutoCloseabl } public void start() { - LOG.debug("Starting {} PCEPExtensionProviderActivator instances", extensionActivators.size()); + LOG.debug("Starting {} PCEPExtensionProviderActivator instances", this.extensionActivators.size()); - for(final PCEPExtensionProviderActivator e : extensionActivators) { - e.start(providerContext); + for(final PCEPExtensionProviderActivator e : this.extensionActivators) { + e.start(this.providerContext); } } @Override public void close() { - LOG.debug("Stopping {} BGPExtensionProviderActivator instances", extensionActivators.size()); + LOG.debug("Stopping {} BGPExtensionProviderActivator instances", this.extensionActivators.size()); - for(final PCEPExtensionProviderActivator e : extensionActivators) { + for(final PCEPExtensionProviderActivator e : this.extensionActivators) { e.stop(); } } diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java index 2dce4eece3..ecc5bdf839 100755 --- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java +++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java @@ -142,7 +142,7 @@ public abstract class AbstractTopologySessionListener implements PCEPSessi */ final InetAddress peerAddress = session.getRemoteAddress(); - syncOptimization = new SyncOptimization(session); + this.syncOptimization = new SyncOptimization(session); final TopologyNodeState state = this.serverSessionManager.takeNodeState(peerAddress, this, isLspDbRetreived()); // takeNodeState(..) may fail when the server session manager is being restarted due to configuration change @@ -173,7 +173,7 @@ public abstract class AbstractTopologySessionListener implements PCEPSessi final Node initialNodeState = state.getInitialNodeState(); final boolean isNodePresent = isLspDbRetreived() && initialNodeState != null; if (isNodePresent) { - loadLspData(initialNodeState, lspData, lsps, isIncrementalSynchro()); + loadLspData(initialNodeState, this.lspData, this.lsps, isIncrementalSynchro()); pccBuilder.setReportedLsp(initialNodeState.getAugmentation(Node1.class).getPathComputationClient().getReportedLsp()); } writeNode(pccBuilder, state, topologyAugment); @@ -198,13 +198,13 @@ public abstract class AbstractTopologySessionListener implements PCEPSessi Futures.addCallback(trans.submit(), new FutureCallback() { @Override public void onSuccess(final Void result) { - LOG.trace("Internal state for session {} updated successfully", session); + LOG.trace("Internal state for session {} updated successfully", AbstractTopologySessionListener.this.session); } @Override public void onFailure(final Throwable t) { - LOG.error("Failed to update internal state for session {}, terminating it", session, t); - session.close(TerminationReason.UNKNOWN); + LOG.error("Failed to update internal state for session {}, terminating it", AbstractTopologySessionListener.this.session, t); + AbstractTopologySessionListener.this.session.close(TerminationReason.UNKNOWN); } }); } @@ -220,13 +220,13 @@ public abstract class AbstractTopologySessionListener implements PCEPSessi Futures.addCallback(ctx.trans.submit(), new FutureCallback() { @Override public void onSuccess(final Void result) { - LOG.trace("Internal state for session {} updated successfully", session); + LOG.trace("Internal state for session {} updated successfully", AbstractTopologySessionListener.this.session); } @Override public void onFailure(final Throwable t) { - LOG.error("Failed to update internal state for session {}", session, t); - session.close(TerminationReason.UNKNOWN); + LOG.error("Failed to update internal state for session {}", AbstractTopologySessionListener.this.session, t); + AbstractTopologySessionListener.this.session.close(TerminationReason.UNKNOWN); } }); } @@ -346,7 +346,7 @@ public abstract class AbstractTopologySessionListener implements PCEPSessi this.listenerState.updateStatefulSentMsg(message); final PCEPRequest req = new PCEPRequest(metadata); this.requests.put(requestId, req); - final int rpcTimeout = serverSessionManager.getRpcTimeout(); + final int rpcTimeout = this.serverSessionManager.getRpcTimeout(); LOG.trace("RPC response timeout value is {} seconds", rpcTimeout); if (rpcTimeout > 0) { setupTimeoutHandler(requestId, req, rpcTimeout); @@ -564,15 +564,15 @@ public abstract class AbstractTopologySessionListener implements PCEPSessi protected abstract void loadLspData(final Node node, final Map lspData, final Map lsps, final boolean incrementalSynchro); protected final boolean isLspDbPersisted() { - if (syncOptimization != null) { - return syncOptimization.isSyncAvoidanceEnabled(); + if (this.syncOptimization != null) { + return this.syncOptimization.isSyncAvoidanceEnabled(); } return false; } protected final boolean isLspDbRetreived() { - if (syncOptimization != null) { - return syncOptimization.isDbVersionPresent(); + if (this.syncOptimization != null) { + return this.syncOptimization.isDbVersionPresent(); } return false; } @@ -583,29 +583,29 @@ public abstract class AbstractTopologySessionListener implements PCEPSessi * @return */ protected final boolean isIncrementalSynchro() { - if (syncOptimization != null) { - return syncOptimization.isSyncAvoidanceEnabled() && syncOptimization.isDeltaSyncEnabled(); + if (this.syncOptimization != null) { + return this.syncOptimization.isSyncAvoidanceEnabled() && this.syncOptimization.isDeltaSyncEnabled(); } return false; } protected final boolean isTriggeredInitialSynchro() { - if (syncOptimization != null) { - return syncOptimization.isTriggeredInitSyncEnabled(); + if (this.syncOptimization != null) { + return this.syncOptimization.isTriggeredInitSyncEnabled(); } return false; } protected final boolean isTriggeredReSyncEnabled() { - if (syncOptimization != null) { - return syncOptimization.isTriggeredReSyncEnabled(); + if (this.syncOptimization != null) { + return this.syncOptimization.isTriggeredReSyncEnabled(); } return false; } protected final boolean isSynchronized() { - if (syncOptimization != null) { - return syncOptimization.doesLspDbMatch(); + if (this.syncOptimization != null) { + return this.syncOptimization.doesLspDbMatch(); } return false; } diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/OperationResults.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/OperationResults.java index 66f69f8a2e..07c4f35ca4 100644 --- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/OperationResults.java +++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/OperationResults.java @@ -68,12 +68,12 @@ final class OperationResults implements OperationResult { @Override public FailureType getFailure() { - return failure; + return this.failure; } @Override public List getError() { - return error; + return this.error; } @Override diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPRequest.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPRequest.java index 8109d25a9e..e681197b25 100755 --- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPRequest.java +++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPRequest.java @@ -40,33 +40,33 @@ final class PCEPRequest { } protected ListenableFuture getFuture() { - return future; + return this.future; } public Metadata getMetadata() { - return metadata; + return this.metadata; } public State getState() { - return state; + return this.state; } Timer getTimer() { - return timer; + return this.timer; } synchronized void done(final OperationResult result) { - if (state != State.DONE) { - LOG.debug("Request went from {} to {}", state, State.DONE); - state = State.DONE; - timer.cancel(); - future.set(result); + if (this.state != State.DONE) { + LOG.debug("Request went from {} to {}", this.state, State.DONE); + this.state = State.DONE; + this.timer.cancel(); + this.future.set(result); } } synchronized void done() { OperationResult result; - switch (state) { + switch (this.state) { case UNSENT: result = OperationResults.UNSENT; break; @@ -82,9 +82,9 @@ final class PCEPRequest { } synchronized void sent() { - if (state == State.UNSENT) { - LOG.debug("Request went from {} to {}", state, State.UNACKED); - state = State.UNACKED; + if (this.state == State.UNSENT) { + LOG.debug("Request went from {} to {}", this.state, State.UNACKED); + this.state = State.UNACKED; } } diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java index 7ce02e8100..4cbe6830c1 100644 --- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java +++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java @@ -205,8 +205,8 @@ class Stateful07TopologySessionListener extends AbstractTopologySessionListener< } private void markAllLspAsStale() { - for (final PlspId plspId : lsps.keySet()) { - staleLsps.add(plspId); + for (final PlspId plspId : this.lsps.keySet()) { + this.staleLsps.add(plspId); } } @@ -229,7 +229,7 @@ class Stateful07TopologySessionListener extends AbstractTopologySessionListener< if (!staleLsp.getPath().isEmpty()) { final Path1 path1 = staleLsp.getPath().get(0).getAugmentation(Path1.class); if (path1 != null) { - staleLsps.add(path1.getLsp().getPlspId()); + Stateful07TopologySessionListener.this.staleLsps.add(path1.getLsp().getPlspId()); } } updatePccState(PccSyncState.PcepTriggeredResync); @@ -735,7 +735,7 @@ class Stateful07TopologySessionListener extends AbstractTopologySessionListener< if (path1 != null) { final PlspId plspId = path1.getLsp().getPlspId(); if (!incrementalSynchro) { - staleLsps.add(plspId); + this.staleLsps.add(plspId); } lsps.put(plspId, lspName); } @@ -750,7 +750,7 @@ class Stateful07TopologySessionListener extends AbstractTopologySessionListener< * @param plspId */ private synchronized void unmarkStaleLsp(final PlspId plspId) { - staleLsps.remove(plspId); + this.staleLsps.remove(plspId); } /** @@ -758,9 +758,9 @@ class Stateful07TopologySessionListener extends AbstractTopologySessionListener< * @param ctx */ private synchronized void purgeStaleLsps(final MessageContext ctx) { - for (final PlspId plspId : staleLsps) { + for (final PlspId plspId : this.staleLsps) { removeLsp(ctx, plspId); } - staleLsps.clear(); + this.staleLsps.clear(); } } diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/SyncOptimization.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/SyncOptimization.java index c064a783ca..9ded8bc553 100644 --- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/SyncOptimization.java +++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/SyncOptimization.java @@ -41,26 +41,26 @@ final class SyncOptimization { } public boolean doesLspDbMatch() { - return dbVersionMatch; + return this.dbVersionMatch; } public boolean isSyncAvoidanceEnabled() { - return isSyncAvoidanceEnabled; + return this.isSyncAvoidanceEnabled; } public boolean isDeltaSyncEnabled() { - return isDeltaSyncEnabled; + return this.isDeltaSyncEnabled; } public boolean isTriggeredInitSyncEnabled() { - return isTriggeredInitialSyncEnable; + return this.isTriggeredInitialSyncEnable; } public boolean isTriggeredReSyncEnabled() { - return isTriggeredReSyncEnable; + return this.isTriggeredReSyncEnable; } public boolean isDbVersionPresent() { - return isDbVersionPresent; + return this.isDbVersionPresent; } private static LspDbVersion getLspDbVersion(final Tlvs openTlvs) { diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyNodeState.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyNodeState.java index 1f0e3488c2..09bab98c57 100644 --- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyNodeState.java +++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyNodeState.java @@ -57,23 +57,23 @@ final class TopologyNodeState implements AutoCloseable, TransactionChainListener } public KeyedInstanceIdentifier getNodeId() { - return nodeId; + return this.nodeId; } public synchronized Metadata getLspMetadata(final String name) { - return metadata.get(name); + return this.metadata.get(name); } public synchronized void setLspMetadata(final String name, final Metadata value) { if (value == null) { - metadata.remove(name); + this.metadata.remove(name); } else { - metadata.put(name, value); + this.metadata.put(name, value); } } public synchronized void cleanupExcept(final Collection values) { - final Iterator it = metadata.keySet().iterator(); + final Iterator it = this.metadata.keySet().iterator(); while (it.hasNext()) { if (!values.contains(it.next())) { it.remove(); @@ -90,29 +90,29 @@ final class TopologyNodeState implements AutoCloseable, TransactionChainListener Futures.addCallback(trans.submit(), new FutureCallback() { @Override public void onSuccess(final Void result) { - LOG.trace("Internal state for node {} cleaned up successfully", nodeId); + LOG.trace("Internal state for node {} cleaned up successfully", TopologyNodeState.this.nodeId); } @Override public void onFailure(final Throwable t) { - LOG.error("Failed to cleanup internal state for session {}", nodeId, t); + LOG.error("Failed to cleanup internal state for session {}", TopologyNodeState.this.nodeId, t); } }); } - lastReleased = System.nanoTime(); + this.lastReleased = System.nanoTime(); } public synchronized void taken(final boolean retrieveNode) { final long now = System.nanoTime(); - if (now - lastReleased > holdStateNanos) { - metadata.clear(); + if (now - this.lastReleased > this.holdStateNanos) { + this.metadata.clear(); } //try to get the topology's node if (retrieveNode) { - Futures.addCallback(readOperationalData(nodeId), new FutureCallback>() { + Futures.addCallback(readOperationalData(this.nodeId), new FutureCallback>() { @Override public void onSuccess(final Optional result) { @@ -120,13 +120,13 @@ final class TopologyNodeState implements AutoCloseable, TransactionChainListener putTopologyNode(); } else { //cache retrieved node - initialNodeState = result.get(); + TopologyNodeState.this.initialNodeState = result.get(); } } @Override public void onFailure(final Throwable t) { - LOG.error("Failed to get topology node {}", nodeId, t); + LOG.error("Failed to get topology node {}", TopologyNodeState.this.nodeId, t); } }); } else { @@ -135,19 +135,19 @@ final class TopologyNodeState implements AutoCloseable, TransactionChainListener } public synchronized Node getInitialNodeState() { - return initialNodeState; + return this.initialNodeState; } WriteTransaction beginTransaction() { - return chain.newWriteOnlyTransaction(); + return this.chain.newWriteOnlyTransaction(); } ReadWriteTransaction rwTransaction() { - return chain.newReadWriteTransaction(); + return this.chain.newReadWriteTransaction(); } ListenableFuture> readOperationalData(final InstanceIdentifier id) { - try (final ReadOnlyTransaction t = chain.newReadOnlyTransaction()) { + try (final ReadOnlyTransaction t = this.chain.newReadOnlyTransaction()) { return t.read(LogicalDatastoreType.OPERATIONAL, id); } } @@ -155,23 +155,23 @@ final class TopologyNodeState implements AutoCloseable, TransactionChainListener @Override public void onTransactionChainFailed(final TransactionChain chain, final AsyncTransaction transaction, final Throwable cause) { // FIXME: flip internal state, so that the next attempt to update fails, triggering node reconnect - LOG.error("Unexpected transaction failure in node {} transaction {}", nodeId, transaction.getIdentifier(), cause); + LOG.error("Unexpected transaction failure in node {} transaction {}", this.nodeId, transaction.getIdentifier(), cause); } @Override public void onTransactionChainSuccessful(final TransactionChain chain) { - LOG.info("Node {} shutdown successfully", nodeId); + LOG.info("Node {} shutdown successfully", this.nodeId); } @Override public void close() { - chain.close(); + this.chain.close(); } private void putTopologyNode() { - final Node node = new NodeBuilder().setKey(nodeId.getKey()).setNodeId(nodeId.getKey().getNodeId()).build(); + final Node node = new NodeBuilder().setKey(this.nodeId.getKey()).setNodeId(this.nodeId.getKey().getNodeId()).build(); final WriteTransaction t = beginTransaction(); - t.put(LogicalDatastoreType.OPERATIONAL, nodeId, node); + t.put(LogicalDatastoreType.OPERATIONAL, this.nodeId, node); t.submit(); } diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyProgramming.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyProgramming.java index 19d9556c45..26b878e4cb 100644 --- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyProgramming.java +++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyProgramming.java @@ -51,7 +51,7 @@ final class TopologyProgramming implements NetworkTopologyPcepProgrammingService Preconditions.checkArgument(input.getName() != null); final SubmitAddLspOutputBuilder b = new SubmitAddLspOutputBuilder(); - b.setResult(AbstractInstructionExecutor.schedule(scheduler, new AbstractInstructionExecutor(input) { + b.setResult(AbstractInstructionExecutor.schedule(this.scheduler, new AbstractInstructionExecutor(input) { @Override protected ListenableFuture invokeOperation() { return TopologyProgramming.this.manager.addLsp(input); @@ -68,7 +68,7 @@ final class TopologyProgramming implements NetworkTopologyPcepProgrammingService Preconditions.checkArgument(input.getName() != null); final SubmitRemoveLspOutputBuilder b = new SubmitRemoveLspOutputBuilder(); - b.setResult(AbstractInstructionExecutor.schedule(scheduler, new AbstractInstructionExecutor(input) { + b.setResult(AbstractInstructionExecutor.schedule(this.scheduler, new AbstractInstructionExecutor(input) { @Override protected ListenableFuture invokeOperation() { return TopologyProgramming.this.manager.removeLsp(input); @@ -85,7 +85,7 @@ final class TopologyProgramming implements NetworkTopologyPcepProgrammingService Preconditions.checkArgument(input.getName() != null); final SubmitUpdateLspOutputBuilder b = new SubmitUpdateLspOutputBuilder(); - b.setResult(AbstractInstructionExecutor.schedule(scheduler, new AbstractInstructionExecutor(input) { + b.setResult(AbstractInstructionExecutor.schedule(this.scheduler, new AbstractInstructionExecutor(input) { @Override protected ListenableFuture invokeOperation() { return TopologyProgramming.this.manager.updateLsp(input); @@ -107,7 +107,7 @@ final class TopologyProgramming implements NetworkTopologyPcepProgrammingService // Preconditions.checkArgument(input.getArguments().getOperational() != null); final SubmitEnsureLspOperationalOutputBuilder b = new SubmitEnsureLspOperationalOutputBuilder(); - b.setResult(AbstractInstructionExecutor.schedule(scheduler, new AbstractInstructionExecutor(input) { + b.setResult(AbstractInstructionExecutor.schedule(this.scheduler, new AbstractInstructionExecutor(input) { @Override protected ListenableFuture invokeOperation() { EnsureLspOperationalInputBuilder ensureLspOperationalInputBuilder = new EnsureLspOperationalInputBuilder(); @@ -126,7 +126,7 @@ final class TopologyProgramming implements NetworkTopologyPcepProgrammingService Preconditions.checkArgument(input.getNode() != null); final SubmitTriggerSyncOutputBuilder b = new SubmitTriggerSyncOutputBuilder(); - b.setResult(AbstractInstructionExecutor.schedule(scheduler, new AbstractInstructionExecutor(input) { + b.setResult(AbstractInstructionExecutor.schedule(this.scheduler, new AbstractInstructionExecutor(input) { @Override protected ListenableFuture invokeOperation() { return TopologyProgramming.this.manager.triggerSync(input); diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyRPCs.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyRPCs.java index 03f67c3dac..383f1709cf 100644 --- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyRPCs.java +++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyRPCs.java @@ -40,27 +40,27 @@ final class TopologyRPCs implements NetworkTopologyPcepService { @Override public Future> addLsp(final AddLspInput input) { - return Futures.transform(manager.addLsp(input), (Function>) input1 -> SuccessfulRpcResult.create(new AddLspOutputBuilder(input1).build())); + return Futures.transform(this.manager.addLsp(input), (Function>) input1 -> SuccessfulRpcResult.create(new AddLspOutputBuilder(input1).build())); } @Override public Future> removeLsp(final RemoveLspInput input) { - return Futures.transform(manager.removeLsp(input), (Function>) input1 -> SuccessfulRpcResult.create(new RemoveLspOutputBuilder(input1).build())); + return Futures.transform(this.manager.removeLsp(input), (Function>) input1 -> SuccessfulRpcResult.create(new RemoveLspOutputBuilder(input1).build())); } @Override public Future> triggerSync(final TriggerSyncInput input) { - return Futures.transform(manager.triggerSync(input), (Function>) input1 -> SuccessfulRpcResult.create(new TriggerSyncOutputBuilder(input1).build())); + return Futures.transform(this.manager.triggerSync(input), (Function>) input1 -> SuccessfulRpcResult.create(new TriggerSyncOutputBuilder(input1).build())); } @Override public Future> updateLsp(final UpdateLspInput input) { - return Futures.transform(manager.updateLsp(input), (Function>) input1 -> SuccessfulRpcResult.create(new UpdateLspOutputBuilder(input1).build())); + return Futures.transform(this.manager.updateLsp(input), (Function>) input1 -> SuccessfulRpcResult.create(new UpdateLspOutputBuilder(input1).build())); } @Override public Future> ensureLspOperational(final EnsureLspOperationalInput input) { - return Futures.transform(manager.ensureLspOperational(input), + return Futures.transform(this.manager.ensureLspOperational(input), (Function>) input1 -> SuccessfulRpcResult.create(new EnsureLspOperationalOutputBuilder(input1).build())); } } diff --git a/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/PCEPTunnelTopologyProvider.java b/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/PCEPTunnelTopologyProvider.java index 11b434c97b..6d178c798a 100644 --- a/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/PCEPTunnelTopologyProvider.java +++ b/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/PCEPTunnelTopologyProvider.java @@ -44,10 +44,10 @@ public final class PCEPTunnelTopologyProvider implements AutoCloseable { @Override public void close() { - reg.close(); + this.reg.close(); } public TopologyReference getTopologyReference() { - return ref; + return this.ref; } } diff --git a/rsvp/impl/src/test/java/org/opendaylight/protocol/rsvp/parser/impl/te/TEObjectTest.java b/rsvp/impl/src/test/java/org/opendaylight/protocol/rsvp/parser/impl/te/TEObjectTest.java index d34da75d10..b2cd629ce0 100644 --- a/rsvp/impl/src/test/java/org/opendaylight/protocol/rsvp/parser/impl/te/TEObjectTest.java +++ b/rsvp/impl/src/test/java/org/opendaylight/protocol/rsvp/parser/impl/te/TEObjectTest.java @@ -34,9 +34,9 @@ public class TEObjectTest { @Before public void setUp() { - act = new RSVPActivator(); - context = new SimpleRSVPExtensionProviderContext(); - act.start(context); + this.act = new RSVPActivator(); + this.context = new SimpleRSVPExtensionProviderContext(); + this.act.start(this.context); } @Test @@ -97,7 +97,7 @@ public class TEObjectTest { @Test public void testExcludeRouteParser() throws RSVPParsingException { - final ExcludeRouteObjectParser parser = new ExcludeRouteObjectParser(context.getXROSubobjectHandlerRegistry()); + final ExcludeRouteObjectParser parser = new ExcludeRouteObjectParser(this.context.getXROSubobjectHandlerRegistry()); final RsvpTeObject obj = parser.parseObject(Unpooled.copiedBuffer( ByteArray.subByte(TEObjectUtil.TE_LSP_EXCLUDE_ROUTE, 4, TEObjectUtil.TE_LSP_EXCLUDE_ROUTE.length - 4))); @@ -108,7 +108,7 @@ public class TEObjectTest { @Test public void testExplicitRouteParser() throws RSVPParsingException { - final ExplicitRouteObjectParser parser = new ExplicitRouteObjectParser(context.getEROSubobjectHandlerRegistry()); + final ExplicitRouteObjectParser parser = new ExplicitRouteObjectParser(this.context.getEROSubobjectHandlerRegistry()); final RsvpTeObject obj = parser.parseObject(Unpooled.copiedBuffer(ByteArray.subByte(TEObjectUtil.TE_LSP_EXPLICIT, 4, TEObjectUtil.TE_LSP_EXPLICIT.length - 4))); @@ -141,7 +141,7 @@ public class TEObjectTest { @Test public void testPrimaryPathRouteParser() throws RSVPParsingException { - final PrimaryPathRouteObjectParser parser = new PrimaryPathRouteObjectParser(context.getEROSubobjectHandlerRegistry()); + final PrimaryPathRouteObjectParser parser = new PrimaryPathRouteObjectParser(this.context.getEROSubobjectHandlerRegistry()); final RsvpTeObject obj = parser.parseObject(Unpooled.copiedBuffer( ByteArray.subByte(TEObjectUtil.TE_LSP_PRIMARY_PATH_ROUTE, 4, TEObjectUtil.TE_LSP_PRIMARY_PATH_ROUTE .length - 4))); @@ -186,7 +186,7 @@ public class TEObjectTest { @Test public void testRecordRouteParser() throws RSVPParsingException { - final RecordRouteObjectParser parser = new RecordRouteObjectParser(context.getRROSubobjectHandlerRegistry()); + final RecordRouteObjectParser parser = new RecordRouteObjectParser(this.context.getRROSubobjectHandlerRegistry()); final RsvpTeObject obj = parser.parseObject(Unpooled.copiedBuffer( ByteArray.subByte(TEObjectUtil.TE_LSP_RECORD_ROUTE, 4, TEObjectUtil.TE_LSP_RECORD_ROUTE.length - 4))); @@ -197,7 +197,7 @@ public class TEObjectTest { @Test public void testSecondaryExplicitRouteParser() throws RSVPParsingException { - final SecondaryExplicitRouteObjectParser parser = new SecondaryExplicitRouteObjectParser(context.getEROSubobjectHandlerRegistry()); + final SecondaryExplicitRouteObjectParser parser = new SecondaryExplicitRouteObjectParser(this.context.getEROSubobjectHandlerRegistry()); final RsvpTeObject obj = parser.parseObject(Unpooled.copiedBuffer( ByteArray.subByte(TEObjectUtil.TE_LSP_SECONDARY_EXPLICIT, 4, TEObjectUtil.TE_LSP_SECONDARY_EXPLICIT .length - 4))); @@ -209,7 +209,7 @@ public class TEObjectTest { @Test public void testSecondaryRecordRouteObjectParser() throws RSVPParsingException { - final SecondaryRecordRouteObjectParser parser = new SecondaryRecordRouteObjectParser(context.getRROSubobjectHandlerRegistry()); + final SecondaryRecordRouteObjectParser parser = new SecondaryRecordRouteObjectParser(this.context.getRROSubobjectHandlerRegistry()); final RsvpTeObject obj = parser.parseObject(Unpooled.copiedBuffer( ByteArray.subByte(TEObjectUtil.TE_LSP_SECONDARY_RECORD_ROUTE, 4, TEObjectUtil.TE_LSP_SECONDARY_RECORD_ROUTE .length - 4))); diff --git a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRSVPExtensionProviderContextActivator.java b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRSVPExtensionProviderContextActivator.java index f0fcc87b3c..b8e22aa9b0 100644 --- a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRSVPExtensionProviderContextActivator.java +++ b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRSVPExtensionProviderContextActivator.java @@ -32,18 +32,18 @@ public class SimpleRSVPExtensionProviderContextActivator implements AutoCloseabl } public void start() { - LOG.debug("Starting {} RSVPExtensionProviderActivator instances", extensionActivators.size()); + LOG.debug("Starting {} RSVPExtensionProviderActivator instances", this.extensionActivators.size()); - for(final RSVPExtensionProviderActivator e : extensionActivators) { - e.start(providerContext); + for(final RSVPExtensionProviderActivator e : this.extensionActivators) { + e.start(this.providerContext); } } @Override public void close() { - LOG.debug("Stopping {} RSVPExtensionProviderActivator instances", extensionActivators.size()); + LOG.debug("Stopping {} RSVPExtensionProviderActivator instances", this.extensionActivators.size()); - for(final RSVPExtensionProviderActivator e : extensionActivators) { + for(final RSVPExtensionProviderActivator e : this.extensionActivators) { e.stop(); } } diff --git a/rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleLabelRegistryTest.java b/rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleLabelRegistryTest.java index 9a27f4e758..52b30202f3 100644 --- a/rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleLabelRegistryTest.java +++ b/rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleLabelRegistryTest.java @@ -39,7 +39,7 @@ public class SimpleLabelRegistryTest { @Before public void setUp() throws RSVPParsingException { MockitoAnnotations.initMocks(this); - this.simpleLabelRegistry.registerLabelParser(cTypeOne, this.labelParser); + this.simpleLabelRegistry.registerLabelParser(this.cTypeOne, this.labelParser); this.simpleLabelRegistry.registerLabelSerializer(MockLabel.class, this.labelSerializer); Mockito.doReturn(new MockLabel()).when(this.labelParser).parseLabel(this.input); final ArgumentCaptor tlvArg = ArgumentCaptor.forClass(LabelType.class); @@ -49,7 +49,7 @@ public class SimpleLabelRegistryTest { @Test public void testParserRegistration() { - assertNotNull(this.simpleLabelRegistry.registerLabelParser(cTypeOne, this.labelParser)); + assertNotNull(this.simpleLabelRegistry.registerLabelParser(this.cTypeOne, this.labelParser)); } @Test @@ -80,7 +80,7 @@ public class SimpleLabelRegistryTest { @Test public void testParseLabel() throws RSVPParsingException { - final LabelType output = this.simpleLabelRegistry.parseLabel(cTypeOne, this.input); + final LabelType output = this.simpleLabelRegistry.parseLabel(this.cTypeOne, this.input); assertNotNull(output); assertTrue(output instanceof MockLabel); -- 2.36.6