Code Clean Up 36/53236/2
authorClaudio D. Gasparini <claudio.gasparini@pantheon.tech>
Mon, 13 Mar 2017 17:01:06 +0000 (18:01 +0100)
committerClaudio D. Gasparini <claudio.gasparini@pantheon.tech>
Wed, 15 Mar 2017 09:23:09 +0000 (09:23 +0000)
Fix instance fields not accessed with this

Change-Id: Iec1520fa728ea21098dd5a79dbfa25837b117e1c
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech>
86 files changed:
bgp/bmp-impl/src/main/java/org/opendaylight/controller/config/yang/bmp/impl/BmpDispatcherImplModule.java
bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterImpl.java
bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/RouterSessionManager.java
bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TableContext.java
bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/session/BmpSessionImpl.java
bgp/bmp-impl/src/test/java/org/opendaylight/controller/config/yang/bmp/impl/AbstractBmpModuleTest.java
bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/session/BmpTestSessionListener.java
bgp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockDispatcher.java
bgp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockSessionTest.java
bgp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockTest.java
bgp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/registry/SimpleBmpExtensionProviderContextActivator.java
bgp/concepts/src/main/java/org/opendaylight/bgp/concepts/RouteDistinguisherUtil.java
bgp/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/attributes/tunnel/identifier/TunnelType.java
bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/RIBActivator.java
bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecExtensionProviderContext.java
bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/l3vpn/AbstractFlowspecL3vpnRIBSupport.java
bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv4NlriParserTest.java
bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv6NlriParserTest.java
bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv4NlriParserTest.java
bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv6NlriParserTest.java
bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/extended/communities/FSExtendedCommunitiesTest.java
bgp/inet/src/test/java/org/opendaylight/protocol/bgp/inet/codec/nexthop/NextHopParserSerializerTest.java
bgp/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/AbstractVpnNextHopParserSerializer.java
bgp/labeled-unicast/src/test/java/org/opendaylight/protocol/bgp/labeled/unicast/LUNlriParserTest.java
bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/BGPActivator.java
bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/ExtendedCommunitiesAttributeParser.java
bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/CommunityTest.java
bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/AbstractFamilyRegistry.java
bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleBGPExtensionProviderContextActivator.java
bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleExtendedCommunityRegistry.java
bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleExtendedCommunityRegistryTest.java
bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/OffsetMap.java
bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/n/paths/AddPathBestNPathSelection.java
bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/OffsetMap.java
bgp/path-selection-mode/src/test/java/org/opendaylight/controller/config/yang/bgp/path/selection/mode/AdvertiseAllPathsModuleTest.java
bgp/path-selection-mode/src/test/java/org/opendaylight/controller/config/yang/bgp/path/selection/mode/AdvertiseNPathsModuleTest.java
bgp/path-selection-mode/src/test/java/org/opendaylight/protocol/bgp/mode/impl/AbstractRouteEntryTest.java
bgp/rib-api/src/main/java/org/opendaylight/protocol/bgp/rib/DefaultRibReference.java
bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPDispatcherImplModule.java
bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractReflectingExportPolicy.java
bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/CachingImportPolicy.java
bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ExportPolicyPeerTrackerImpl.java
bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/PeerExportGroupImpl.java
bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/PolicyDatabase.java
bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RouteUpdateKey.java
bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ToExternalExportPolicy.java
bgp/rib-spi/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/spi/RIBExtensionsImplModule.java
bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupport.java
bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/BGPTerminationReason.java
bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/PeerExportGroup.java
bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/ServiceLoaderRIBExtensionConsumerContext.java
bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/SimpleRIBExtensionProviderContextActivator.java
bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RibSupportUtilsTest.java
bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RouterIdsTest.java
concepts/src/main/java/org/opendaylight/protocol/concepts/AbstractRegistration.java
concepts/src/main/java/org/opendaylight/protocol/concepts/DefaultInstanceReference.java
integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/AbstractPcepOsgiTest.java
integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/PcepRpcServicesRoutingTest.java
pcep/impl/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModule.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/AbstractPCEPSessionNegotiator.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPHandlerFactory.java
pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/AbstractPCEPSessionTest.java
pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImplTest.java
pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPValidatorTest.java
pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/TestVendorInformationTlvParser.java
pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCSyncOptimization.java
pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCsBuilder.java
pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/TimerHandler.java
pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCServerPeerProposal.java
pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing/SrEroSubobjectParser.java
pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing/SrRroSubobjectParser.java
pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/SrEroSubobjectParserTest.java
pcep/segment-routing/src/test/java/org/opendaylight/protocol/pcep/segment/routing/SrRroSubobjectParserTest.java
pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimplePCEPExtensionProviderContextActivator.java
pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java
pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/OperationResults.java
pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPRequest.java
pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java
pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/SyncOptimization.java
pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyNodeState.java
pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyProgramming.java
pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyRPCs.java
pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/PCEPTunnelTopologyProvider.java
rsvp/impl/src/test/java/org/opendaylight/protocol/rsvp/parser/impl/te/TEObjectTest.java
rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRSVPExtensionProviderContextActivator.java
rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleLabelRegistryTest.java

index 85c0ab2af445e5de8112d785dd0704171a5970b2..634c4021eaacd4bc0907865a47fe1e5e78bbae10 100644 (file)
@@ -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<BmpDispatcher> 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
index 6008ecc41194c1421667e4bb18a371a107f068d9..4bf05fc35f53af2d19760d7920b3e522f1359e3e 100644 (file)
@@ -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();
index 900609fd63c023499fd61b65675d31812f6411eb..90eca5e641869609f4c581cc3d03176f6a023a76 100644 (file)
@@ -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() {
index 2c7a80c9233e4e4695bd2cc1a0a1748b454314fa..8ccb81885760896620881f9cf801b0fe253e2931 100644 (file)
@@ -87,11 +87,11 @@ final class TableContext {
 
     void createTable(final DOMDataWriteTransaction tx) {
         final DataContainerNodeBuilder<YangInstanceIdentifier.NodeIdentifierWithPredicates, MapEntryNode> 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<QName, Object> e : tableKey.getKeyValues().entrySet()) {
             tb.withChild(ImmutableNodes.leafNode(e.getKey(), e.getValue()));
         }
index 652be4b4fb0173726279125fb78f6c000ffdc178..c4655f0cc715ed68de818d97419ce8c1fb2c9ee2 100644 (file)
@@ -63,7 +63,7 @@ public final class BmpSessionImpl extends SimpleChannelInboundHandler<Notificati
     @Override
     public void channelActive(final ChannelHandlerContext ctx) throws Exception {
         this.channel = ctx.channel();
-        LOG.info("Starting session {} <-> {}.", 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<Notificati
     }
 
     private void sessionUp() {
-        Preconditions.checkArgument(State.IDLE == state);
+        Preconditions.checkArgument(State.IDLE == this.state);
         this.listener.onSessionUp(this);
         this.state = State.UP;
     }
index efbaf3fe9ffd8a3b4aaf69322116db6a5d6e7754..50da138f0c537059d87ce021807a6afc3d429dc3 100644 (file)
@@ -43,7 +43,7 @@ public class AbstractBmpModuleTest extends AbstractConfigTest {
             final Filter mockFilter = mock(Filter.class);
             doReturn(str).when(mockFilter).toString();
             return mockFilter;
-        }).when(mockedContext).createFilter(anyString());
+        }).when(this.mockedContext).createFilter(anyString());
 
         Mockito.doNothing().when(this.mockedContext).addServiceListener(any(ServiceListener.class), Mockito.anyString());
         Mockito.doNothing().when(this.mockedContext).removeServiceListener(any(ServiceListener.class));
@@ -61,10 +61,10 @@ public class AbstractBmpModuleTest extends AbstractConfigTest {
 
     void setupMockService(final Class<?> 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);
     }
 }
index 34d8501c8eb73d8e17ba4d22616519a3c43776bf..25c16580152df293ea10e88de14a4ccf69bd9db5 100644 (file)
@@ -26,7 +26,7 @@ public class BmpTestSessionListener implements BmpSessionListener {
     private boolean up = false;
 
     public boolean isUp () {
-        return up;
+        return this.up;
     }
 
     public List<Notification> getListMsg() {
index 47da129062a44b78893d3ae272b043d6763e9569..a3d819cbf513688d920d75e600c73fb2b9c4ab3b 100644 (file)
@@ -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;
     }
 
index e25d0666e4381c153a50a8e77612cf9c62b8ccc1..62c311fada214d270f484b0b17a339e4a2510185 100644 (file)
@@ -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());
index 031111e3e097b5a6764281bfe2e2aa3a7dd49650..7b1d873ae83dffc420bc3619920c68754f4b0b17 100644 (file)
@@ -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;
index 0c874ff9d8f0e1ad06a9a301d5db7c6df24f10dc..4930a971d66bc29283798426a58eccdcc711033b 100644 (file)
@@ -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();
         }
     }
index 1b9c041ae6bc4e85eeaa5272f54b8ccebb7ebcd5..74c60175aa3f2a39958909ed5e267802fc2ab87e 100644 (file)
@@ -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) {
index ee6c62f6ea93b4df31c06c53db6bbd375723a27b..0bd6f6ad2fc86f661a3ad5c12cf03475a5daa407 100644 (file)
@@ -36,10 +36,10 @@ enum TunnelType {
     }
 
     public Class<? extends TunnelIdentifier> getClazz() {
-        return clazz;
+        return this.clazz;
     }
 
     public int getIntValue() {
-        return value;
+        return this.value;
     }
 }
index f74da66854bc89daaf23e1bcc07039339a422978..a35fef1792f8861a5d491a2b93a72fe11eead76e 100644 (file)
@@ -30,10 +30,10 @@ public final class RIBActivator extends AbstractRIBExtensionProviderActivator {
     @Override
     protected List<AutoCloseable> startRIBExtensionProviderImpl(final RIBExtensionProviderContext context) {
         final List<AutoCloseable> 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;
     }
 }
index ed36a9f80f104d1e32057631059f00d131898c5a..e26da225c7be7dcac2c6d98b4a2139e88b1483eb 100644 (file)
@@ -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];
     }
 }
index d1fc2f724fe99736a38dee50acf1e69aaa107cc2..8ffc827fe8a7813e5d71bdd2aec48d583574cd8c 100644 (file)
@@ -61,7 +61,7 @@ public abstract class AbstractFlowspecL3vpnRIBSupport<T extends AbstractFlowspec
         final PathId pathId = PathIdUtil.buildPathId(routesCont, routePathIdNid());
             final RouteDistinguisher rd = extractRouteDistinguisher(routesCont, this.routeDistinguisherNID);
         return this.nlriParser.createWithdrawnDestinationType(
-            new Object[] {rd, nlriParser.extractFlowspec(Iterables.getOnlyElement(routes))},
+            new Object[] {rd, this.nlriParser.extractFlowspec(Iterables.getOnlyElement(routes))},
             pathId
         );
     }
index 3a4c1f1a26d1db94be5c8143ccc4f73888a4bee1..feb29e5958c5cb0bc5c2b3db54c534d26a0b1b49 100644 (file)
@@ -161,13 +161,13 @@ public class FlowspecL3vpnIpv4NlriParserTest {
     };
 
     private final SimpleFlowspecExtensionProviderContext flowspecContext = new SimpleFlowspecExtensionProviderContext();
-    private final FlowspecActivator fsa = new FlowspecActivator(flowspecContext);
-    private final FlowspecL3vpnIpv4NlriParser FS_PARSER = new FlowspecL3vpnIpv4NlriParser(flowspecContext.getFlowspecTypeRegistry(SimpleFlowspecExtensionProviderContext.AFI.IPV4, SimpleFlowspecExtensionProviderContext.SAFI.FLOWSPEC_VPN));
+    private final FlowspecActivator fsa = new FlowspecActivator(this.flowspecContext);
+    private final FlowspecL3vpnIpv4NlriParser FS_PARSER = new FlowspecL3vpnIpv4NlriParser(this.flowspecContext.getFlowspecTypeRegistry(SimpleFlowspecExtensionProviderContext.AFI.IPV4, SimpleFlowspecExtensionProviderContext.SAFI.FLOWSPEC_VPN));
 
     @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());
     }
 
@@ -200,7 +200,7 @@ public class FlowspecL3vpnIpv4NlriParserTest {
         builder.setFlowspecType(sps);
         fs.add(builder.build());
 
-        final FlowspecL3vpnIpv4NlriParser parser = new FlowspecL3vpnIpv4NlriParser(flowspecContext.getFlowspecTypeRegistry(SimpleFlowspecExtensionProviderContext.AFI.IPV4, SimpleFlowspecExtensionProviderContext.SAFI.FLOWSPEC_VPN));
+        final FlowspecL3vpnIpv4NlriParser parser = new FlowspecL3vpnIpv4NlriParser(this.flowspecContext.getFlowspecTypeRegistry(SimpleFlowspecExtensionProviderContext.AFI.IPV4, SimpleFlowspecExtensionProviderContext.SAFI.FLOWSPEC_VPN));
 
         final MpReachNlriBuilder result = new MpReachNlriBuilder();
         result.setAfi(Ipv4AddressFamily.class);
@@ -230,7 +230,7 @@ public class FlowspecL3vpnIpv4NlriParserTest {
         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(
@@ -298,7 +298,7 @@ public class FlowspecL3vpnIpv4NlriParserTest {
         builder.setFlowspecType(sps);
         fs.add(builder.build());
 
-        final FlowspecL3vpnIpv4NlriParser parser = new FlowspecL3vpnIpv4NlriParser(flowspecContext.getFlowspecTypeRegistry(SimpleFlowspecExtensionProviderContext.AFI.IPV4, SimpleFlowspecExtensionProviderContext.SAFI.FLOWSPEC_VPN));
+        final FlowspecL3vpnIpv4NlriParser parser = new FlowspecL3vpnIpv4NlriParser(this.flowspecContext.getFlowspecTypeRegistry(SimpleFlowspecExtensionProviderContext.AFI.IPV4, SimpleFlowspecExtensionProviderContext.SAFI.FLOWSPEC_VPN));
 
         final MpReachNlriBuilder result = new MpReachNlriBuilder();
         result.setAfi(Ipv4AddressFamily.class);
@@ -329,7 +329,7 @@ public class FlowspecL3vpnIpv4NlriParserTest {
         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() {
@@ -371,7 +371,7 @@ public class FlowspecL3vpnIpv4NlriParserTest {
         builder.setFlowspecType(fragment);
         fs.add(builder.build());
 
-        final FlowspecL3vpnIpv4NlriParser parser = new FlowspecL3vpnIpv4NlriParser(flowspecContext.getFlowspecTypeRegistry(SimpleFlowspecExtensionProviderContext.AFI.IPV4, SimpleFlowspecExtensionProviderContext.SAFI.FLOWSPEC_VPN));
+        final FlowspecL3vpnIpv4NlriParser parser = new FlowspecL3vpnIpv4NlriParser(this.flowspecContext.getFlowspecTypeRegistry(SimpleFlowspecExtensionProviderContext.AFI.IPV4, SimpleFlowspecExtensionProviderContext.SAFI.FLOWSPEC_VPN));
 
         final MpUnreachNlriBuilder result = new MpUnreachNlriBuilder();
         result.setAfi(Ipv4AddressFamily.class);
@@ -403,7 +403,7 @@ public class FlowspecL3vpnIpv4NlriParserTest {
         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));
 
     }
 
@@ -483,7 +483,7 @@ public class FlowspecL3vpnIpv4NlriParserTest {
         builder.setFlowspecType(fragment);
         fs.add(builder.build());
 
-        final FlowspecL3vpnIpv4NlriParser parser = new FlowspecL3vpnIpv4NlriParser(flowspecContext.getFlowspecTypeRegistry(SimpleFlowspecExtensionProviderContext.AFI.IPV4, SimpleFlowspecExtensionProviderContext.SAFI.FLOWSPEC_VPN));
+        final FlowspecL3vpnIpv4NlriParser parser = new FlowspecL3vpnIpv4NlriParser(this.flowspecContext.getFlowspecTypeRegistry(SimpleFlowspecExtensionProviderContext.AFI.IPV4, SimpleFlowspecExtensionProviderContext.SAFI.FLOWSPEC_VPN));
 
         final MpUnreachNlriBuilder result = new MpUnreachNlriBuilder();
         result.setAfi(Ipv4AddressFamily.class);
@@ -516,7 +516,7 @@ public class FlowspecL3vpnIpv4NlriParserTest {
         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));
 
     }
 
@@ -536,7 +536,7 @@ public class FlowspecL3vpnIpv4NlriParserTest {
         expectedFS.setFlowspecType(new DestinationPrefixCaseBuilder().setDestinationPrefix(new Ipv4Prefix("127.0.0.5/32")).build());
         final List<Flowspec> 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<Flowspec> 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<Flowspec> 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<Flowspec> 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<Flowspec> 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<Flowspec> 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<Flowspec> 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<Flowspec> 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<Flowspec> 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<Flowspec> 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<Flowspec> 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<Flowspec> 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));
     }
 }
 
index c8c0fda3aa37ca84c07ce68bc8dc178567852b49..3325f06388066e38fb936dda74960033b739ea43 100644 (file)
@@ -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<Flowspec> 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<Flowspec> 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<Flowspec> 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<Flowspec> 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<Flowspec> expectedValue = new ArrayList<>();
         expectedValue.add(expectedFS.build());
-        assertEquals(expectedValue, FS_PARSER.extractFlowspec(entry.build()));
+        assertEquals(expectedValue, this.FS_PARSER.extractFlowspec(entry.build()));
     }
 }
 
index c943928989a379a3006a501a24acca0f0a94daae..5d52c72e65ed1b8ef81f7200c42c77723d0d3b20 100644 (file)
@@ -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<Flowspec> 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<Flowspec> 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<Flowspec> 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<Flowspec> 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<Flowspec> 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<Flowspec> 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<Flowspec> 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<Flowspec> 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<Flowspec> 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<Flowspec> 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<Flowspec> 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<Flowspec> 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<Flowspec> expected = new ArrayList<>();
         expected.add(expectedFS.build());
-        assertEquals(expected, FS_PARSER.extractFlowspec(entry.build()));
+        assertEquals(expected, this.FS_PARSER.extractFlowspec(entry.build()));
     }
 }
 
index 2234b0a27aca1d0d20e2a3faefb2defca41022cf..c8e8c3ffa6a76b2f4f1e732cdea2f0af9dc67204 100644 (file)
@@ -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<Flowspec> 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<Flowspec> 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<Flowspec> 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<Flowspec> 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<Flowspec> 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<Flowspec> 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<Flowspec> 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<Flowspec> 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<Flowspec> expectedValue = new ArrayList<>();
         expectedValue.add(expectedFS.build());
-        assertEquals(expectedValue, FS_PARSER.extractFlowspec(entry.build()));
+        assertEquals(expectedValue, this.FS_PARSER.extractFlowspec(entry.build()));
     }
 }
 
index fdf1779df0cda1fbddbc8f8baadbdeb87eb09c61..830382d9a97993c1f11fafbf026c80efd9468d23 100644 (file)
@@ -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());
     }
 
index a4ea2eebaa85f0a6dfcdec7e9ec827541f466d61..806f13cc46f360f7e97f47e6c68597bef83fd673 100644 (file)
@@ -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());
         }
index 5edb84b577d9b11bb4d61158238833c2a40a8705..a03f2ac5bd730da0882b7e36f8fd7d6dd6d16828 100644 (file)
@@ -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);
     }
index a06b71ae4cf84447abca5c0a339ddd7a0691a055..695e2913383ac65c66f55c1a5160802f2135a67f 100755 (executable)
@@ -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());
     }
 
index 12ec7316ce832a86e1922ad1fe2815061fd7f35b..7c1ae46e9be6e41980e3fcc2184975da074107f9 100644 (file)
@@ -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) {
index 29bc1b165d5762ce46f64825e6387079ce2a160c..255af832045a24f139bd08283e99ae4ae8c6b351 100644 (file)
@@ -38,7 +38,7 @@ public final class ExtendedCommunitiesAttributeParser implements AttributeParser
     public void parseAttribute(final ByteBuf buffer, final AttributesBuilder builder) throws BGPDocumentedException, BGPParsingException {
         final List<ExtendedCommunities> 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);
             }
index da87a9c4ebdc75f57a2b4b7f49a6c47bde01ffd5..7d9d9aa9661fa12124ed9b5704d375d1d02ade5d 100644 (file)
@@ -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());
     }
index 41d863fe970fdfbff9d405c9f2c56c669fb11f6b..45f7e0a3d631bda9ab9e5b44ac50fd452a9a6e98 100644 (file)
@@ -21,14 +21,14 @@ abstract class AbstractFamilyRegistry<C, N> {
     protected synchronized AutoCloseable registerFamily(final Class<? extends C> 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<C, N> {
             @Override
             protected void removeRegistration() {
                 synchronized (lock) {
-                    classToNumber.remove(clazz);
-                    numberToClass.remove(number);
+                    AbstractFamilyRegistry.this.classToNumber.remove(clazz);
+                    AbstractFamilyRegistry.this.numberToClass.remove(number);
                 }
             }
         };
     }
 
     protected Class<? extends C> classForFamily(final N number) {
-        return numberToClass.get(number);
+        return this.numberToClass.get(number);
     }
 
     protected N numberForClass(final Class<? extends C> clazz) {
-        return classToNumber.get(clazz);
+        return this.classToNumber.get(clazz);
     }
 }
index 11bac1d23f2b725071bb74e792ddffb88756277c..13dae6c5c26ce7d2f4b3eba3910c690b718aceea 100644 (file)
@@ -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();
         }
     }
index 46f1abab2906dd5eaff14c0827e8b6debf310ed1..3cb453e9a02532a4c29c7ff59244311e49def181 100644 (file)
@@ -70,12 +70,12 @@ final class SimpleExtendedCommunityRegistry implements ExtendedCommunityRegistry
     synchronized AutoCloseable registerExtendedCommunitySerializer(
             final Class<? extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.extended.community.ExtendedCommunity> 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) {
index bd7939ff2158634b05801ff172e273cc41d21557..31542228be32073b67e7fd870bab2694d07b292b 100644 (file)
@@ -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);
     }
 
 }
index 28d2a6fda7008d7bdc782b4773b3dac90291e7ce..ae57d35147e515a6bedc4475d71c7c2e7bac4e0c 100644 (file)
@@ -94,13 +94,13 @@ public final class OffsetMap {
 
     public <T> 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 <T> 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> 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);
index 5e05237bd9eefdcfbd1048850f459e9a4ceaf429..96aed302ef1a75b7a18d109d611b4ea967683e95 100644 (file)
@@ -33,6 +33,6 @@ public class AddPathBestNPathSelection implements PathSelectionMode {
     }
 
     public Long getNBestPaths() {
-        return nBestPaths;
+        return this.nBestPaths;
     }
 }
\ No newline at end of file
index 63e8b7cee25f2c9ddf373d89705b6026cb0b1bea..a07a0c29a13556fc11705281979a50261e071c6d 100644 (file)
@@ -98,13 +98,13 @@ final class OffsetMap {
 
     public <T> 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 <T> 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> 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);
index 1323929872ca213bcf3e78a7183606fb5a28c5d6..31afc555f395c6c67bc6f5124f4ba35216b885b9 100644 (file)
@@ -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);
index b447a6294c11b1048fa12c435e26504c30acdff2..98df6234b46dbf9d8c8fe506a8eccc72c32c6960 100644 (file)
@@ -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);
index ef3e648b0182101def0c1f448e78c0b412597faf..d40a0a7159c2f95bd0e156bee8b46dd26f0821cd 100644 (file)
@@ -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();
index b736a953efeaec15ae27384804735563915441db..ad17a12cb5bcd0dd67b7612f3bcb439f542845bc 100644 (file)
@@ -24,6 +24,6 @@ public class DefaultRibReference implements RibReference {
 
     @Override
     public final KeyedInstanceIdentifier<Rib, RibKey> getInstanceIdentifier() {
-        return instanceIdentifier;
+        return this.instanceIdentifier;
     }
 }
index 6866421bdce31753f0340a4bcefe4ab7f4c0a4da..e824aedf9281751bfd4adc833ca9cda2009f3636 100644 (file)
@@ -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<BGPDispatcher> 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
index 6e5763def083afaf6fe2e41cbfacd50a91d6ea9c..e732a382d725d3af4573385671f21db1387fe2e1 100644 (file)
@@ -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);
     }
 
     /**
index 57023aa28a1284234c8446151dd7439987a04a1b..c9cfb93cc0603371c80c33d5951a602bbeb83580 100644 (file)
@@ -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;
 
     }
index 4d5bbdbbb8d73e56f72d5c1d80c4a5437d515d50..1807dfe11eebfe0f092e5b4572b9c777c9962baa 100644 (file)
@@ -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);
                 }
             }
         };
index 69ba399ce140a321f6d0538264f1a0aeb490e512..7a5b42f156f7389d77323054464ae4d878b6f978 100644 (file)
@@ -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<Map.Entry<PeerId, PeerExporTuple>> getPeers() {
-        return peers.entrySet();
+        return this.peers.entrySet();
     }
 
     @Override
index a376928fc2a0d7a1dc38e55d9921130ebed943c2..36d0f62e2c0c2816616d7e7be425ea918a979682 100644 (file)
@@ -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));
     }
 }
index f0c3a257b35fe5da7ff4d0581382aaa4ad8fd6bc..7b6da1c296f93fd2d235ec61edb726c8ec4de259 100644 (file)
@@ -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;
index 0bbcd81252df9cdb84d433f842347cba457daa3c..a5cf30e49b3d5236f8493ec8cb0a3ab68e38c77b 100644 (file)
@@ -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:
index b372b80bc30cd05ea6e3710aa1126f888c379061..142f1383a33f46f85b5d53f085243a913c24c006 100644 (file)
@@ -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<RIBExtensionProviderContext> 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
index e7708e1311b4f519c4c37b14bc5edc856a345c47..48d0f7c745f777783fe7d256a3ad82223cc07abc 100644 (file)
@@ -144,13 +144,13 @@ public abstract class AbstractRIBSupport implements RIBSupport {
     @Nonnull
     @Override
     public final Class<? extends AddressFamily> getAfi() {
-        return afiClass;
+        return this.afiClass;
     }
 
     @Nonnull
     @Override
     public final Class<? extends SubsequentAddressFamily> getSafi() {
-        return safiClass;
+        return this.safiClass;
     }
 
     /**
index af9e2ca6cd6c4d40c0648f7b89ab2165323a61d0..323993d539d79c042e04001b874c7f8e34fba6da 100644 (file)
@@ -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();
     }
 }
index d8c538e0e799e6ce45df5a3000db855d05b6bbf9..ff7e91798d2e7179764310e696b2270c1b4a8472 100644 (file)
@@ -29,11 +29,11 @@ public interface PeerExportGroup {
         }
 
         public YangInstanceIdentifier getYii() {
-            return yii;
+            return this.yii;
         }
 
         public PeerRole getRole() {
-            return role;
+            return this.role;
         }
     }
 
index 5a763bd9bb1bde74634f09b4a92bd210a5e6690b..98042ddc3c64e8e76e59356ac5c6400de2422f10 100644 (file)
@@ -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) {
index 732320dae9aa292b56f2996a0e487123f9bf9277..b149d0d730030ba5962a910b7762e19ab5571d16 100644 (file)
@@ -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();
         }
     }
index c1ba1705cec08d7b7d5e96c8fd784d4ae35dd730..07aa47e1ead16fac622262171643aaab291857b3 100644 (file)
@@ -64,8 +64,8 @@ public class RibSupportUtilsTest {
         final Map<QName, Object> 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<QName, Object> 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());
 
     }
index 23d718596f530dd1e0cf7b8fc46e0ad4c5bd88e1..23d0d01bf1525b5f6eafc9ac99496cd876da626e 100644 (file)
@@ -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
index 7a34fdac2f71f56dc5901e0bc3fe1036a14175ce..9f41a110e9dd8e556378903ed466b6868a12fc6e 100644 (file)
@@ -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();
         }
     }
index c88445196beaeadad4d108b712dae24f127142f2..766af9efa4d91bb76887882d3aa2d963aa85f541 100644 (file)
@@ -24,6 +24,6 @@ public class DefaultInstanceReference<T extends DataObject> implements InstanceR
 
     @Override
     public final InstanceIdentifier<T> getInstanceIdentifier() {
-        return instanceIdentifier;
+        return this.instanceIdentifier;
     }
 }
index 4b3fc6d864f09b120ea323615616930d837b5b9a..1222f94e594f3fc95f9c8b4a7df7346b0799be55 100644 (file)
@@ -26,12 +26,12 @@ public class AbstractPcepOsgiTest extends AbstractMdsalTestBase {
     BindingAwareBroker broker = null;
 
     public BindingAwareBroker getBroker() {
-        if (broker == null) {
-            ServiceReference<BindingAwareBroker> serviceReference = bundleContext.getServiceReference(BindingAwareBroker.class);
+        if (this.broker == null) {
+            ServiceReference<BindingAwareBroker> 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;
     }
index 04b89b2f7774e0eb36f61f7c04dcbb88616dbe3f..bb26de7c2d98fe089146e10934d8e2ea9b1852ab 100644 (file)
@@ -137,7 +137,7 @@ public class PcepRpcServicesRoutingTest extends AbstractPcepOsgiTest {
             }
         };
 
-        broker.registerProvider(provider1);
+        this.broker.registerProvider(provider1);
 
         final InstanceIdentifier<Topology> 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<Topology> 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<Topology> 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) {
index 36f0ab79fe5a24407cb6da9eba7b55b5397851ff..74b26a3e1b2d5aea197a7902c3373cea8ffb686d 100644 (file)
@@ -44,7 +44,7 @@ public final class PCEPDispatcherImplModule extends AbstractPCEPDispatcherImplMo
     @Override
     public AutoCloseable createInstance() {
         final WaitingServiceTracker<PCEPDispatcher> 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() {
index af933e15c6ed3b91c1b7fcd951d5029475d84f72..508e2c18b7db65c8528fb9d7d1f620ccaa7b4d34 100644 (file)
@@ -189,7 +189,7 @@ public abstract class AbstractPCEPSessionNegotiator extends AbstractSessionNegot
     }
 
     private void cancelTimers() {
-        failTimer.cancel(false);
+        this.failTimer.cancel(false);
     }
 
     private void startNegotiationWithOpen() {
index 475b7227aa11b8611577944e2af8319aaae86386..7768f373f83a285e66c5ee421dc5057e51dd1f88 100644 (file)
@@ -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), };
     }
 }
index 933ffac672a003d8d25e61fd4b254ded1c3d2750..c65164e22f2b2b63970188b1a2e2f0098c3ec5ff 100644 (file)
@@ -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(
index 29677fd23bd51111bbe1962d8787b964a64becbe..8eccb4b8e48389108253dd24b1bcbf7ae44a7bbb 100644 (file)
@@ -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());
index dece9115ecca199c4512d7e98624db592f8784d7..e654d3ac52454dfb15522dbb3315f6a34344f54b 100644 (file)
@@ -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> paths = Lists.newArrayList();
         final PathsBuilder paBuilder = new PathsBuilder();
index cd8eadd453e7538a84d2962c6f353e2729904513..61209af041fa0e4afc700327b9ff90747bcea32a 100644 (file)
@@ -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;
index 5d4ce11e81f5a15fb022e09a765256391f8a2ecf..40f224b031b4f50dc64fcad71dc5f0abf1b2038c 100644 (file)
@@ -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() {
index 6482849503f48503a41c292f23846895b5e2f1db..e43b7b9c6b243999b09dde7cba2553346c1eaf9e 100644 (file)
@@ -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<PCEPSessionImpl> 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);
         }
     }
 
index 1c5ec5ef046bb98253c689f1e499cf25fe1af661..f48768e4c3daf80c0c99f02088e99bd67706ab2f 100644 (file)
@@ -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;
         }
     }
 
index 8995208d30eb2f4b567ead6d7a4296747c600669..05bf2efa0abab7f03830b0634b116af8b81e5cd2 100644 (file)
@@ -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());
     }
index b4e2cf7175ca6abfcf009319fdfae4467d08aa19..bf4376b6720bc36560d3551e97e8216ce7c3ebc6 100644 (file)
@@ -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
index 3830cb6fdfa70dcecdaee6d95049c84c14655868..24cf22fc0bb6071bb40ca388c4be96555ee4aa06 100644 (file)
@@ -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
index 3a927e5b1b61df5033f2e7a44da9942ba585ba71..d78e8e94ef459fb1024a026c76fe3173f9a35e67 100644 (file)
@@ -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));
     }
 }
index 38d4ff6c09400c69bb930f8d70b26f7c61e433a0..a9a7afa870bace31b0e724dcb42fff9d64092c8b 100644 (file)
@@ -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));
     }
 }
index 829331d9a6fea3c0a950cb958705951c6f378939..4c67b8e9f523d1e7eb252d90221cd01b1a5ae61e 100644 (file)
@@ -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();
         }
     }
index 2dce4eece3e7e30d0ab0bc4749e60ac976f916fa..ecc5bdf839ea02fb2f2ae139e8d35b3aad6dfafe 100755 (executable)
@@ -142,7 +142,7 @@ public abstract class AbstractTopologySessionListener<S, L> 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<S, L> 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<S, L> implements PCEPSessi
         Futures.addCallback(trans.submit(), new FutureCallback<Void>() {
             @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<S, L> implements PCEPSessi
         Futures.addCallback(ctx.trans.submit(), new FutureCallback<Void>() {
             @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<S, L> 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<S, L> implements PCEPSessi
     protected abstract void loadLspData(final Node node, final Map<String, ReportedLsp> lspData, final Map<L, String> 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<S, L> 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;
     }
index 66f69f8a2e8408943ea6dd29aa9511a8eb555200..07c4f35ca469a82aef6a5df41762db93197767e9 100644 (file)
@@ -68,12 +68,12 @@ final class OperationResults implements OperationResult {
 
     @Override
     public FailureType getFailure() {
-        return failure;
+        return this.failure;
     }
 
     @Override
     public List<Error> getError() {
-        return error;
+        return this.error;
 
     }
     @Override
index 8109d25a9e99db78e0e940ebd94b3b96b7ec3903..e681197b250b8aa23b9f9d6b9df7f4300076f486 100755 (executable)
@@ -40,33 +40,33 @@ final class PCEPRequest {
     }
 
     protected ListenableFuture<OperationResult> 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;
         }
     }
 
index 7ce02e810086d07a2099c4b69557a7c837550bfa..4cbe6830c140c0e439006b9024e865c9b3fec26f 100644 (file)
@@ -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();
     }
 }
index c064a783ca21f762dc8afe57017241863c592515..9ded8bc553e9421f763fce73a9751eb7eb33f7b9 100644 (file)
@@ -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) {
index 1f0e3488c210edb66d06e872029935c0be3c381e..09bab98c5738f2536d522b1664cccd22ea455b72 100644 (file)
@@ -57,23 +57,23 @@ final class TopologyNodeState implements AutoCloseable, TransactionChainListener
     }
 
     public KeyedInstanceIdentifier<Node, NodeKey> 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<String> values) {
-        final Iterator<String> it = metadata.keySet().iterator();
+        final Iterator<String> 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<Void>() {
                 @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<Optional<Node>>() {
+            Futures.addCallback(readOperationalData(this.nodeId), new FutureCallback<Optional<Node>>() {
 
                 @Override
                 public void onSuccess(final Optional<Node> 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();
     }
 
     <T extends DataObject> ListenableFuture<Optional<T>> readOperationalData(final InstanceIdentifier<T> 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();
     }
 
index 19d9556c458ce380220050e5b301f784f18792e1..26b878e4cb979b37b7c9d9531f4d4c72ce2367d6 100644 (file)
@@ -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<OperationResult> 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<OperationResult> 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<OperationResult> 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<OperationResult> 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<OperationResult> invokeOperation() {
                 return TopologyProgramming.this.manager.triggerSync(input);
index 03f67c3dac7e0e2ba1751808675a2bc21a2592f7..383f1709cfe172049f518edcca920c3ff30bd5d6 100644 (file)
@@ -40,27 +40,27 @@ final class TopologyRPCs implements NetworkTopologyPcepService {
 
     @Override
     public Future<RpcResult<AddLspOutput>> addLsp(final AddLspInput input) {
-        return Futures.transform(manager.addLsp(input), (Function<OperationResult, RpcResult<AddLspOutput>>) input1 -> SuccessfulRpcResult.create(new AddLspOutputBuilder(input1).build()));
+        return Futures.transform(this.manager.addLsp(input), (Function<OperationResult, RpcResult<AddLspOutput>>) input1 -> SuccessfulRpcResult.create(new AddLspOutputBuilder(input1).build()));
     }
 
     @Override
     public Future<RpcResult<RemoveLspOutput>> removeLsp(final RemoveLspInput input) {
-        return Futures.transform(manager.removeLsp(input), (Function<OperationResult, RpcResult<RemoveLspOutput>>) input1 -> SuccessfulRpcResult.create(new RemoveLspOutputBuilder(input1).build()));
+        return Futures.transform(this.manager.removeLsp(input), (Function<OperationResult, RpcResult<RemoveLspOutput>>) input1 -> SuccessfulRpcResult.create(new RemoveLspOutputBuilder(input1).build()));
     }
 
     @Override
     public Future<RpcResult<TriggerSyncOutput>> triggerSync(final TriggerSyncInput input) {
-        return Futures.transform(manager.triggerSync(input), (Function<OperationResult, RpcResult<TriggerSyncOutput>>) input1 -> SuccessfulRpcResult.create(new TriggerSyncOutputBuilder(input1).build()));
+        return Futures.transform(this.manager.triggerSync(input), (Function<OperationResult, RpcResult<TriggerSyncOutput>>) input1 -> SuccessfulRpcResult.create(new TriggerSyncOutputBuilder(input1).build()));
     }
 
     @Override
     public Future<RpcResult<UpdateLspOutput>> updateLsp(final UpdateLspInput input) {
-        return Futures.transform(manager.updateLsp(input), (Function<OperationResult, RpcResult<UpdateLspOutput>>) input1 -> SuccessfulRpcResult.create(new UpdateLspOutputBuilder(input1).build()));
+        return Futures.transform(this.manager.updateLsp(input), (Function<OperationResult, RpcResult<UpdateLspOutput>>) input1 -> SuccessfulRpcResult.create(new UpdateLspOutputBuilder(input1).build()));
     }
 
     @Override
     public Future<RpcResult<EnsureLspOperationalOutput>> ensureLspOperational(final EnsureLspOperationalInput input) {
-        return Futures.transform(manager.ensureLspOperational(input),
+        return Futures.transform(this.manager.ensureLspOperational(input),
             (Function<OperationResult, RpcResult<EnsureLspOperationalOutput>>) input1 -> SuccessfulRpcResult.create(new EnsureLspOperationalOutputBuilder(input1).build()));
     }
 }
index 11b434c97b2233e39127877f1daa0333f29f6001..6d178c798ade3232e4520abd666d4a54a850b451 100644 (file)
@@ -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;
     }
 }
index d34da75d10b9b4df89d9ea85e3cec44423106943..b2cd629ce01c3218f745b39b7f857fa995ab9c73 100644 (file)
@@ -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)));
index f0fcc87b3c99493eaac2dd0e77eeac48f6bf93f5..b8e22aa9b0d1ba454615a21b9655ff237c5063d9 100644 (file)
@@ -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();
         }
     }
index 9a27f4e7587ae52923bead9e2156b67640b7e068..52b30202f349194b6fc25fee7d637799a0f7ea67 100644 (file)
@@ -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<LabelType> 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);