BUG-8007: Code Clean Up 30/53430/7
authorClaudio D. Gasparini <claudio.gasparini@pantheon.tech>
Mon, 13 Mar 2017 16:59:21 +0000 (17:59 +0100)
committerClaudio D. Gasparini <claudio.gasparini@pantheon.tech>
Thu, 13 Apr 2017 06:42:32 +0000 (08:42 +0200)
Anonymous type replaced by lambda

Change-Id: Idd81b1e43866e5d960ec2dfa777b66bae3e53da9
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech>
122 files changed:
bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpMonitoringStationImpl.java
bgp/bmp-impl/src/test/java/org/opendaylight/controller/config/yang/bmp/impl/AbstractBmpModuleTest.java
bgp/bmp-impl/src/test/java/org/opendaylight/controller/config/yang/bmp/impl/BmpMonitorImplModuleTest.java
bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/session/BmpDispatcherImplTest.java
bgp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMock.java
bgp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockArguments.java
bgp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockSession.java
bgp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockSessionTest.java
bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/PeerDownHandler.java
bgp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/TestUtil.java
bgp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpMessageWithTlvParserTest.java
bgp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/registry/AbstractBmpExtensionProviderActivatorTest.java
bgp/cli/src/main/java/org/opendaylight/protocol/bgp/cli/AbstractStatsCommandProvider.java
bgp/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/spi/pojo/SimpleEvpnNlriRegistry.java
bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/AbstractFlowspecNlriParser.java
bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/extended/communities/TrafficMarkingEcHandler.java
bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv6NlriParserTest.java
bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv6NlriParserTest.java
bgp/inet/src/test/java/org/opendaylight/protocol/bgp/inet/Ipv6BgpPrefixSidParserTest.java
bgp/inet/src/test/java/org/opendaylight/protocol/bgp/inet/codec/BGPParserTest.java
bgp/inet/src/test/java/org/opendaylight/protocol/bgp/inet/codec/Ipv4NlriParserTest.java
bgp/inet/src/test/java/org/opendaylight/protocol/bgp/inet/codec/nexthop/NextHopParserSerializerTest.java
bgp/labeled-unicast/src/main/java/org/opendaylight/protocol/bgp/labeled/unicast/OriginatorSrgbTlvParser.java
bgp/labeled-unicast/src/test/java/org/opendaylight/protocol/bgp/labeled/unicast/BgpPrefixSidTlvsTest.java
bgp/openconfig-impl/src/main/java/org/opendaylight/protocol/bgp/openconfig/impl/BGPConfigStateStoreImpl.java
bgp/openconfig-impl/src/main/java/org/opendaylight/protocol/bgp/openconfig/impl/moduleconfig/AddPathFunction.java
bgp/openconfig-impl/src/main/java/org/opendaylight/protocol/bgp/openconfig/impl/moduleconfig/BGPAppPeerProvider.java
bgp/openconfig-impl/src/main/java/org/opendaylight/protocol/bgp/openconfig/impl/moduleconfig/BGPPeerProvider.java
bgp/openconfig-impl/src/main/java/org/opendaylight/protocol/bgp/openconfig/impl/moduleconfig/BGPRibImplProvider.java
bgp/openconfig-impl/src/main/java/org/opendaylight/protocol/bgp/openconfig/impl/moduleconfig/DataBrokerFunction.java
bgp/openconfig-impl/src/main/java/org/opendaylight/protocol/bgp/openconfig/impl/moduleconfig/PathSelectionModeFunction.java
bgp/openconfig-impl/src/main/java/org/opendaylight/protocol/bgp/openconfig/impl/moduleconfig/RibInstanceFunction.java
bgp/openconfig-impl/src/main/java/org/opendaylight/protocol/bgp/openconfig/impl/moduleconfig/TableTypesFunction.java
bgp/openconfig-impl/src/test/java/org/opendaylight/protocol/bgp/openconfig/impl/BGPConfigHolderImplTest.java
bgp/openconfig-impl/src/test/java/org/opendaylight/protocol/bgp/openconfig/impl/moduleconfig/BGPOpenConfigListenerTest.java
bgp/openconfig-impl/src/test/java/org/opendaylight/protocol/bgp/openconfig/impl/moduleconfig/BGPPeerProviderTest.java
bgp/openconfig-impl/src/test/java/org/opendaylight/protocol/bgp/openconfig/impl/moduleconfig/BGPRibImplProviderTest.java
bgp/openconfig-impl/src/test/java/org/opendaylight/protocol/bgp/openconfig/impl/openconfig/AbstractBGPOpenConfigMapperTest.java
bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/BgpPrefixSidAttributeParser.java
bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/AddPathCapabilityHandlerTest.java
bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/BGPParserTest.java
bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleAttributeRegistry.java
bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleBGPExtensionProviderContext.java
bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleRegistryTest.java
bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/UnrecognizedAttributesTest.java
bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/BestPathStateImpl.java
bgp/rib-impl/pom.xml
bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/RIBImplModule.java
bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractBGPSessionNegotiator.java
bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BgpPeerRpc.java
bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPProtocolSessionPromise.java
bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/InstanceType.java
bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/stats/peer/route/PerTableTypeRouteCounter.java
bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModuleTest.java
bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionImplTest.java
bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/BgpPeerRpcTest.java
bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/FSMTest.java
bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/PeerTest.java
bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SynchronizationAndExceptionTest.java
bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/AbstractConfig.java
bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeerTest.java
bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImplTest.java
bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupportTest.java
bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilder.java
bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/config/BackwardsCssTopologyProvider.java
bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/UriBuilderTest.java
bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModuleTest.java
bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModuleTest.java
bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModuleTest.java
concepts/src/test/java/org/opendaylight/protocol/concepts/BandwidthTest.java
concepts/src/test/java/org/opendaylight/protocol/concepts/MultiRegistryTest.java
data-change-counter/src/main/java/org/opendaylight/controller/config/yang/bgpcep/data/change/counter/DataChangeCounterImplModule.java
data-change-counter/src/test/java/org/opendaylight/controller/config/yang/bgpcep/data/change/counter/DataChangeCounterImplModuleTest.java
pcep/auto-bandwidth-extension/src/test/java/org/opendaylight/protocol/pcep/auto/bandwidth/extension/PcRptMessageCodecTest.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPErrorMessageParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPMonitoringReplyMessageParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPNotificationMessageParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPReplyMessageParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPRequestMessageParser.java
pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/util/Util.java
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/PathBindingTlvParser.java
pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07ErrorMessageParser.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/AbstractPCEPSessionNegotiator.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/AbstractSessionNegotiator.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPByteToMessageDecoder.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPDispatcherImpl.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPPeerRegistry.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPProtocolSessionPromise.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPSessionNegotiator.java
pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/spi/Util.java
pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/MockPCE.java
pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPTlvParserTest.java
pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/Main.java
pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTunnelManagerImpl.java
pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/api/LspType.java
pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCPeerProposal.java
pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/spi/MsgBuilderUtil.java
pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCMockCommon.java
pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTunnelManagerImplTest.java
pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParser.java
pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/PSTUtil.java
pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/UnknownObject.java
pcep/spi/src/test/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParserTest.java
pcep/spi/src/test/java/org/opendaylight/protocol/pcep/spi/AbstractObjectWithTlvsTest.java
pcep/spi/src/test/java/org/opendaylight/protocol/pcep/spi/RegistryTest.java
pcep/testtool/src/test/java/org/opendaylight/protocol/pcep/testtool/PCCMock.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/Stateful07TopologySessionListener.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/CreateTunnelInstructionExecutor.java
pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/DestroyTunnelInstructionExecutor.java
pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunelProgrammingUtil.java
pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/UpdateTunnelInstructionExecutor.java
pcep/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgrammingTest.java
rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRSVPExtensionProviderContext.java
rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleEROSubobjectRegistryTest.java
rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRROSubobjectRegistryTest.java
rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleXROSubobjectRegistryTest.java
rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/EROSubobjectListParserTest.java
rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/RROSubobjectListParserTest.java
rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/XROSubobjectListParserTest.java

index f93876c28faae3f2327ab59e9249d758c7475d4b..cb9337ebdde771ac923d7070badd2acfe00bbeb0 100644 (file)
@@ -144,12 +144,7 @@ public final class BmpMonitoringStationImpl implements BmpMonitoringStation {
 
     @Override
     public void close() throws Exception {
-        this.channel.close().addListener(new ChannelFutureListener() {
-            @Override
-            public void operationComplete(final ChannelFuture channelFuture) throws Exception {
-                BmpMonitoringStationImpl.this.sessionManager.close();
-            }
-        }).await();
+        this.channel.close().addListener((ChannelFutureListener) channelFuture -> BmpMonitoringStationImpl.this.sessionManager.close()).await();
 
         final DOMDataWriteTransaction wTx = this.domDataBroker.newWriteOnlyTransaction();
         wTx.delete(LogicalDatastoreType.OPERATIONAL, this.yangMonitorId);
index 727b78a9986c7e037b8f0f43b2c4386298d76206..e3896101da3559ffd4c69b7327bdcc73e752c086 100644 (file)
@@ -15,8 +15,6 @@ import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import org.junit.Before;
 import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 import org.opendaylight.controller.config.manager.impl.AbstractConfigTest;
 import org.opendaylight.protocol.bgp.parser.spi.AddressFamilyRegistry;
 import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderContext;
@@ -38,14 +36,11 @@ import org.osgi.framework.ServiceReference;
 public class AbstractBmpModuleTest extends AbstractConfigTest {
     @Before
     public void setUp() throws Exception {
-        doAnswer(new Answer<Filter>() {
-            @Override
-            public Filter answer(final InvocationOnMock invocation) {
-                final String str = invocation.getArgumentAt(0, String.class);
-                final Filter mockFilter = mock(Filter.class);
-                doReturn(str).when(mockFilter).toString();
-                return mockFilter;
-            }
+        doAnswer(invocation -> {
+            final String str = invocation.getArgumentAt(0, String.class);
+            final Filter mockFilter = mock(Filter.class);
+            doReturn(str).when(mockFilter).toString();
+            return mockFilter;
         }).when(mockedContext).createFilter(anyString());
 
         Mockito.doNothing().when(this.mockedContext).addServiceListener(any(ServiceListener.class), Mockito.anyString());
index fc26fd387d4ee71f6e1a302431633917973dab03..7159cc74d94904634a9c8ffa810bd01d40bace21 100644 (file)
@@ -32,8 +32,6 @@ import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 import org.opendaylight.controller.config.api.jmx.CommitStatus;
 import org.opendaylight.controller.config.manager.impl.factoriesresolver.HardcodedModuleFactoriesResolver;
 import org.opendaylight.controller.config.util.ConfigTransactionJMXClient;
@@ -142,26 +140,23 @@ public class BmpMonitorImplModuleTest extends AbstractBmpModuleTest {
         final SchemaContext context = parseYangStreams(getFilesAsByteSources(getYangModelsPaths()));
         final SchemaService mockedSchemaService = mock(SchemaService.class);
         doReturn(context).when(mockedSchemaService).getGlobalContext();
-        doAnswer(new Answer<ListenerRegistration<SchemaContextListener>>() {
-            @Override
-            public ListenerRegistration<SchemaContextListener> answer(InvocationOnMock invocation) {
-                invocation.getArgumentAt(0, SchemaContextListener.class).onGlobalContextUpdated(context);
-                ListenerRegistration<SchemaContextListener> reg = mock(ListenerRegistration.class);
-                doNothing().when(reg).close();
-                return reg;
-            }
+        doAnswer(invocation -> {
+            invocation.getArgumentAt(0, SchemaContextListener.class).onGlobalContextUpdated(context);
+            final ListenerRegistration<SchemaContextListener> reg = mock(ListenerRegistration.class);
+            doNothing().when(reg).close();
+            return reg;
         }).when(mockedSchemaService).registerSchemaContextListener(any(SchemaContextListener.class));
 
         setupMockService(SchemaService.class, mockedSchemaService);
         setupMockService(YangTextSourceProvider.class, mock(YangTextSourceProvider.class));
         Mockito.doReturn(mockedSchemaService).when(this.mockedContext).getService(schemaServiceReference);
 
-        BindingToNormalizedNodeCodec bindingCodec = BindingToNormalizedNodeCodecFactory.newInstance(
+        final BindingToNormalizedNodeCodec bindingCodec = BindingToNormalizedNodeCodecFactory.newInstance(
                 GeneratedClassLoadingStrategy.getTCCLClassLoadingStrategy());
         BindingToNormalizedNodeCodecFactory.registerInstance(bindingCodec, mockedSchemaService);
         setupMockService(BindingToNormalizedNodeCodec.class, bindingCodec);
 
-        BmpDispatcher bmpDispatcher = new BmpDispatcherImpl(new NioEventLoopGroup(), new NioEventLoopGroup(),
+        final BmpDispatcher bmpDispatcher = new BmpDispatcherImpl(new NioEventLoopGroup(), new NioEventLoopGroup(),
                 new SimpleBmpMessageRegistry(), new DefaultBmpSessionFactory());
         setupMockService(BmpDispatcher.class, bmpDispatcher);
     }
index 69edf89a186dbaf93d6013043eb62cfe1373fddf..9fd8163fffdab88b6d4b0e26b07b591c695602e6 100644 (file)
@@ -26,7 +26,6 @@ import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderContext;
 import org.opendaylight.protocol.bgp.parser.spi.pojo.SimpleBGPExtensionProviderContext;
 import org.opendaylight.protocol.bmp.api.BmpDispatcher;
 import org.opendaylight.protocol.bmp.api.BmpSession;
-import org.opendaylight.protocol.bmp.api.BmpSessionFactory;
 import org.opendaylight.protocol.bmp.api.BmpSessionListenerFactory;
 import org.opendaylight.protocol.bmp.impl.BmpDispatcherImpl;
 import org.opendaylight.protocol.bmp.parser.BmpActivator;
@@ -69,13 +68,7 @@ public class BmpDispatcherImplTest {
         this.bmpActivator.start(ctx);
         final BmpMessageRegistry messageRegistry = ctx.getBmpMessageRegistry();
 
-        this.dispatcher = new BmpDispatcherImpl(new NioEventLoopGroup(), new NioEventLoopGroup(), messageRegistry, new BmpSessionFactory() {
-            @Override
-            public BmpSession getSession(final Channel channel,
-                    final BmpSessionListenerFactory sessionListenerFactory) {
-                return BmpDispatcherImplTest.this.mockedSession;
-            }
-        });
+        this.dispatcher = new BmpDispatcherImpl(new NioEventLoopGroup(), new NioEventLoopGroup(), messageRegistry, (channel, sessionListenerFactory) -> BmpDispatcherImplTest.this.mockedSession);
     }
 
     @After
index 19d6a3c29e0c3b668174bb796efd61544eb3ef7f..c129b1802e635b484f2b3143400c72d93bf29fca 100644 (file)
@@ -9,15 +9,11 @@
 package org.opendaylight.protocol.bmp.mock;
 
 import com.google.common.net.InetAddresses;
-import io.netty.channel.Channel;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import org.opendaylight.protocol.bgp.parser.impl.BGPActivator;
 import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderContext;
 import org.opendaylight.protocol.bgp.parser.spi.pojo.SimpleBGPExtensionProviderContext;
-import org.opendaylight.protocol.bmp.api.BmpSession;
-import org.opendaylight.protocol.bmp.api.BmpSessionFactory;
-import org.opendaylight.protocol.bmp.api.BmpSessionListenerFactory;
 import org.opendaylight.protocol.bmp.parser.BmpActivator;
 import org.opendaylight.protocol.bmp.spi.registry.BmpExtensionProviderActivator;
 import org.opendaylight.protocol.bmp.spi.registry.BmpExtensionProviderContext;
@@ -58,13 +54,7 @@ public final class BmpMock {
         bmpActivator.start(ctx);
 
         return new BmpMockDispatcher(ctx.getBmpMessageRegistry(),
-            new BmpSessionFactory() {
-                @Override
-                public BmpSession getSession(final Channel channel,
-                    final BmpSessionListenerFactory sessionListenerFactory) {
-                    return new BmpMockSession(arguments.getPeersCount(), arguments.getPrePolicyRoutesCount(), arguments.getPostPolicyRoutesCount());
-                }
-            });
+            (channel, sessionListenerFactory) -> new BmpMockSession(arguments.getPeersCount(), arguments.getPrePolicyRoutesCount(), arguments.getPostPolicyRoutesCount()));
     }
 
     private static void deployClients(final BmpMockDispatcher dispatcher, final BmpMockArguments arguments) {
index 8293c02ebb9698651a63d76310c48a1866e57312..005612ce8b49a4b7318981bf63d85ef6c45fea42 100644 (file)
@@ -16,10 +16,8 @@ import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import net.sourceforge.argparse4j.ArgumentParsers;
 import net.sourceforge.argparse4j.impl.Arguments;
-import net.sourceforge.argparse4j.inf.Argument;
 import net.sourceforge.argparse4j.inf.ArgumentParser;
 import net.sourceforge.argparse4j.inf.ArgumentParserException;
-import net.sourceforge.argparse4j.inf.ArgumentType;
 import net.sourceforge.argparse4j.inf.Namespace;
 import org.opendaylight.protocol.util.ArgumentsInput;
 
@@ -101,25 +99,9 @@ public final class BmpMockArguments implements ArgumentsInput {
         parser.addArgument(toArgName(PRE_POLICY_ROUTES_COUNT_DST)).type(Integer.class).setDefault(0);
         parser.addArgument(toArgName(POST_POLICY_ROUTES_COUNT_DST)).type(Integer.class).setDefault(0);
         parser.addArgument(toArgName(PASSIVE_MODE_DST)).action(Arguments.storeTrue());
-        parser.addArgument(toArgName(LOCAL_ADDRESS_DST)).type(new ArgumentType<InetSocketAddress>() {
-            @Override
-            public InetSocketAddress convert(final ArgumentParser parser, final Argument arg, final String value)
-                    throws ArgumentParserException {
-                return getInetSocketAddress(value, DEFAULT_LOCAL_PORT);
-            }
-        }).setDefault(LOCAL_ADDRESS);
-        parser.addArgument(toArgName(REMOTE_ADDRESS_DST)).type(new ArgumentType<InetSocketAddress>() {
-            @Override
-            public InetSocketAddress convert(final ArgumentParser parser, final Argument arg, final String value)
-                    throws ArgumentParserException {
-                return getInetSocketAddress(value, DEFAULT_REMOTE_PORT);
-            }
-        }).setDefault(REMOTE_ADDRESS);
-        parser.addArgument(toArgName(LOG_LEVEL_DST)).type(new ArgumentType<Level>(){
-            @Override
-            public Level convert(final ArgumentParser parser, final Argument arg, final String value) throws ArgumentParserException {
-                return Level.toLevel(value);
-            }}).setDefault(Level.INFO);
+        parser.addArgument(toArgName(LOCAL_ADDRESS_DST)).type((parser13, arg, value) -> getInetSocketAddress(value, DEFAULT_LOCAL_PORT)).setDefault(LOCAL_ADDRESS);
+        parser.addArgument(toArgName(REMOTE_ADDRESS_DST)).type((parser12, arg, value) -> getInetSocketAddress(value, DEFAULT_REMOTE_PORT)).setDefault(REMOTE_ADDRESS);
+        parser.addArgument(toArgName(LOG_LEVEL_DST)).type((parser1, arg, value) -> Level.toLevel(value)).setDefault(Level.INFO);
         return parser;
     }
 
index 05724c861fb99cd2a5c4a719c7e42c5969361da6..f338be57659774fed44c0011cb7e7adfa494b169 100644 (file)
@@ -12,7 +12,6 @@ import static org.opendaylight.protocol.util.Ipv4Util.incrementIpv4Address;
 import static org.opendaylight.protocol.util.Ipv4Util.incrementIpv4Prefix;
 
 import io.netty.channel.Channel;
-import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
@@ -66,12 +65,7 @@ public final class BmpMockSession extends SimpleChannelInboundHandler<Notificati
     @Override
     public void channelActive(final ChannelHandlerContext ctx) {
         this.channel = ctx.channel();
-        this.channel.closeFuture().addListener(new ChannelFutureListener() {
-            @Override
-            public void operationComplete(final ChannelFuture future) throws Exception {
-                LOG.info("BMP session {} final successfully established.", BmpMockSession.this.channel);
-            }
-        });
+        this.channel.closeFuture().addListener((ChannelFutureListener) future -> LOG.info("BMP session {} final successfully established.", BmpMockSession.this.channel));
         LOG.info("BMP session {} successfully established.", this.channel);
         final InetSocketAddress localAddress = (InetSocketAddress) this.channel.localAddress();
         this.remoteAddress = (InetSocketAddress) this.channel.remoteAddress();
index 5be0a04401eb253ee02632fe1d365195e9a22f11..06f61f26f1203093b52485b395343947e902d6ea 100644 (file)
@@ -23,8 +23,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 import org.opendaylight.protocol.util.InetSocketAddressUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev150512.InitiationMessage;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev150512.PeerUp;
@@ -51,12 +49,9 @@ public class BmpMockSessionTest {
         Mockito.doReturn(LOCAL_ADDRESS).when(this.channel).localAddress();
         final ChannelPipeline pipeline = Mockito.mock(ChannelPipeline.class);
         Mockito.doReturn(pipeline).when(this.channel).pipeline();
-        Mockito.doAnswer(new Answer<Void>() {
-            @Override
-            public Void answer(final InvocationOnMock invocation) throws Throwable {
-                messages.add((Notification) invocation.getArguments()[0]);
-                return null;
-            }
+        Mockito.doAnswer(invocation -> {
+            messages.add((Notification) invocation.getArguments()[0]);
+            return null;
         }).when(this.channel).writeAndFlush(Mockito.any());
         final ChannelFuture channelFuture = Mockito.mock(ChannelFuture.class);
         Mockito.doReturn(null).when(channelFuture).addListener(Mockito.any());
index fdcf7c03c2fc798c99a7713f2d1429d505ea2f6a..e58c3bf45da23dbce70427caf2c90b10cecf95a2 100644 (file)
@@ -47,7 +47,7 @@ public class PeerDownHandler extends AbstractBmpPerPeerMessageParser<PeerDownNot
         if (peerDown.isLocalSystemClosed()) {
             if (peerDown.getData() instanceof FsmEventCode) {
                 ByteBufWriteUtil.writeUnsignedByte(REASON_TWO.getValue(), buffer);
-                ByteBufWriteUtil.writeUnsignedShort(((FsmEventCode) peerDown.getData()).getFsmEventCode().intValue(), buffer);
+                ByteBufWriteUtil.writeUnsignedShort(((FsmEventCode) peerDown.getData()).getFsmEventCode(), buffer);
             } else if (peerDown.getData() instanceof
                 org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev150512.peer.down.data.Notification) {
                 ByteBufWriteUtil.writeUnsignedByte(REASON_ONE.getValue(), buffer);
index fbb056eecfa64a41310a82ee99fcb2d155851a56..a1c79d07af6026a1e010519996db7b93e105e554 100644 (file)
@@ -41,7 +41,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mess
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.attributes.MultiExitDiscBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.attributes.OriginBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.attributes.OriginatorIdBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.attributes.UnrecognizedAttributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.attributes.aigp.AigpTlvBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.attributes.as.path.Segments;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.attributes.as.path.SegmentsBuilder;
@@ -307,7 +306,7 @@ public final class TestUtil {
             .setMultiExitDisc(new MultiExitDiscBuilder().setMed(123L).build())
             .setOrigin(new OriginBuilder().setValue(BgpOrigin.Igp).build())
             .setOriginatorId(new OriginatorIdBuilder().setOriginator(IPV4_ADDRESS_12).build())
-            .setUnrecognizedAttributes(new ArrayList<UnrecognizedAttributes>());
+            .setUnrecognizedAttributes(new ArrayList<>());
         return attribBuilder.build();
     }
 
index 3b907ed9135e4fdb3ca4ed2a05c2d69da7d007df..1e16c246f512490b5179969f9a559c1cca5865d9 100644 (file)
@@ -33,22 +33,16 @@ public class AbstractBmpMessageWithTlvParserTest {
     private static final byte[] DATA = { 0, 1, 0, 4, 't', 'e', 's', 't' };
     private static final int TYPE = 1;
 
-    public static final BmpTlvSerializer DESCRIPTION_TLV_SERIALIZER = new BmpTlvSerializer() {
-        @Override
-        public void serializeTlv(final Tlv tlv, final ByteBuf output) {
-            Preconditions.checkArgument(tlv instanceof DescriptionTlv, "DescriptionTlv is mandatory.");
-            TlvUtil.formatTlvAscii(TYPE, ((DescriptionTlv) tlv).getDescription(), output);
-        }
+    public static final BmpTlvSerializer DESCRIPTION_TLV_SERIALIZER = (tlv, output) -> {
+        Preconditions.checkArgument(tlv instanceof DescriptionTlv, "DescriptionTlv is mandatory.");
+        TlvUtil.formatTlvAscii(TYPE, ((DescriptionTlv) tlv).getDescription(), output);
     };
 
-    public static final BmpTlvParser DESCRIPTION_TLV_PARSER = new BmpTlvParser() {
-        @Override
-        public Tlv parseTlv(final ByteBuf buffer) throws BmpDeserializationException {
-            if (buffer == null) {
-                return null;
-            }
-            return new DescriptionTlvBuilder().setDescription(buffer.toString(StandardCharsets.US_ASCII)).build();
+    public static final BmpTlvParser DESCRIPTION_TLV_PARSER = buffer -> {
+        if (buffer == null) {
+            return null;
         }
+        return new DescriptionTlvBuilder().setDescription(buffer.toString(StandardCharsets.US_ASCII)).build();
     };
 
     @Before
index 63e55ce77fa95c1eab58d4a77c5ab1aa8fbf56fb..9aa0ec1e3a60f85d9c28c1bb9fe481cf4d6c44fa 100644 (file)
@@ -32,7 +32,7 @@ public class AbstractBmpExtensionProviderActivatorTest {
     private static class SimpleAbstractBmpExtensionProviderActivator extends AbstractBmpExtensionProviderActivator {
         @Override
         protected List<AutoCloseable> startImpl(final BmpExtensionProviderContext context) {
-            final List<AutoCloseable> reg = new ArrayList<AutoCloseable>();
+            final List<AutoCloseable> reg = new ArrayList<>();
             reg.add(context.registerBmpMessageParser(1, new SimpleBmpMessageRegistry()));
             return reg;
         }
index c8e81b8fde9c4049604740270ce11b710ec7c666..5caf7156cc26e9b51646380c721d8ced9f50ada3 100644 (file)
@@ -29,9 +29,7 @@ public abstract class AbstractStatsCommandProvider extends OsgiCommandSupport {
     @Override
     protected final Object doExecute() throws Exception {
         final PrintStream out = this.session.getConsole();
-        getObjectNames().forEach(objectName -> {
-            onExecution(out, getRuntimeMXBean(objectName), objectName);
-        });
+        getObjectNames().forEach(objectName -> onExecution(out, getRuntimeMXBean(objectName), objectName));
         return null;
     }
 
index 5da38162c59bf14d2182388aad7fb3cad8b53676..afa14ddad1c827054ff774d24b031761b3691483 100644 (file)
@@ -74,12 +74,12 @@ public class SimpleEvpnNlriRegistry implements EvpnRegistry {
 
     @Override
     public EvpnChoice serializeEvpnModel(final ChoiceNode evpnChoice) {
-        return getEvpnCase(evpnChoice, (serializer, cont) -> serializer.serializeEvpnModel(cont));
+        return getEvpnCase(evpnChoice, EvpnSerializer::serializeEvpnModel);
     }
 
     @Override
     public EvpnChoice serializeEvpnRouteKey(final ChoiceNode evpnChoice) {
-        return getEvpnCase(evpnChoice, (serializer, cont) -> serializer.createRouteKey(cont));
+        return getEvpnCase(evpnChoice, EvpnSerializer::createRouteKey);
     }
 
     private EvpnChoice getEvpnCase(final ChoiceNode evpnChoice, final SerializerInterface serializerInterface) {
index b637cc8a7beab441e7fd4da8fd3c207846265fa8..4eae0d2d07bdcf687c9e787a60220fab84ae76d8 100644 (file)
@@ -469,7 +469,7 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri
     protected final String stringNlri(final List<Flowspec> flows) {
         final StringBuilder buffer = new StringBuilder("all packets ");
         final Joiner joiner = Joiner.on(FLOW_SEPARATOR);
-        joiner.appendTo(buffer, Iterables.transform(flows, fs -> encodeFlow(fs)));
+        joiner.appendTo(buffer, Iterables.transform(flows, this::encodeFlow));
         return buffer.toString().replace("  ", " ");
     }
 
index 52f8319a06512fbfbcd70519ec108a459378b8ff..e46e80e624dbb03cafb5dddf61275bb886adbbd4 100644 (file)
@@ -35,7 +35,7 @@ public class TrafficMarkingEcHandler implements ExtendedCommunityParser, Extende
                 "The extended community %s is not TrafficMarkingExtendedCommunity type.", extendedCommunity);
         final TrafficMarkingExtendedCommunity trafficMarking = ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.flowspec.rev150807.TrafficMarkingExtendedCommunity) extendedCommunity).getTrafficMarkingExtendedCommunity();
         byteAggregator.writeZero(RESERVED);
-        ByteBufWriteUtil.writeUnsignedByte(trafficMarking.getGlobalAdministrator().getValue().shortValue(), byteAggregator);
+        ByteBufWriteUtil.writeUnsignedByte(trafficMarking.getGlobalAdministrator().getValue(), byteAggregator);
     }
 
     @Override
index 72d060df98892cb85bb75025a628ac4f21c2e292..01cc276a9471e0528be11a2948cee5007cbe6970 100644 (file)
@@ -289,8 +289,8 @@ public class FlowspecL3vpnIpv6NlriParserTest {
 
     private FlowspecType createLabel() {
         final List<FlowLabel> labels = Lists.newArrayList();
-        labels.add(new FlowLabelBuilder().setOp(new NumericOperand(false, false, true, false, false)).setValue(new Long(16777222L)).build());
-        labels.add(new FlowLabelBuilder().setOp(new NumericOperand(false, true, true, false, false)).setValue(new Long(258L)).build());
+        labels.add(new FlowLabelBuilder().setOp(new NumericOperand(false, false, true, false, false)).setValue(16777222L).build());
+        labels.add(new FlowLabelBuilder().setOp(new NumericOperand(false, true, true, false, false)).setValue(258L).build());
         return new FlowLabelCaseBuilder().setFlowLabel(labels).build();
     }
 
index add3327ba8788dc2db3c4ecf8259ea078c4f4d9c..7a3b68611e1d95257e12d545308489b33aaecf72 100644 (file)
@@ -267,8 +267,8 @@ public class SimpleFlowspecIpv6NlriParserTest {
 
     private FlowspecType createLabel() {
         final List<FlowLabel> labels = Lists.newArrayList();
-        labels.add(new FlowLabelBuilder().setOp(new NumericOperand(false, false, true, false, false)).setValue(new Long(16777222L)).build());
-        labels.add(new FlowLabelBuilder().setOp(new NumericOperand(false, true, true, false, false)).setValue(new Long(258L)).build());
+        labels.add(new FlowLabelBuilder().setOp(new NumericOperand(false, false, true, false, false)).setValue(16777222L).build());
+        labels.add(new FlowLabelBuilder().setOp(new NumericOperand(false, true, true, false, false)).setValue(258L).build());
         return new FlowLabelCaseBuilder().setFlowLabel(labels).build();
     }
 
index 1424b8b36f133c1d0005a7ca353ff16eb34b8dc5..579706ffec8e28d8c90b1f3778e2e9bfb496cd75 100644 (file)
@@ -17,7 +17,6 @@ import org.junit.Test;
 import org.opendaylight.protocol.bgp.inet.codec.Ipv6BgpPrefixSidParser;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev150305.update.attributes.bgp.prefix.sid.bgp.prefix.sid.tlvs.bgp.prefix.sid.tlv.Ipv6SidTlvBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.attributes.bgp.prefix.sid.bgp.prefix.sid.tlvs.BgpPrefixSidTlv;
-import org.opendaylight.yangtools.yang.binding.DataContainer;
 
 public final class Ipv6BgpPrefixSidParserTest {
 
@@ -27,12 +26,7 @@ public final class Ipv6BgpPrefixSidParserTest {
 
     @Test(expected=IllegalArgumentException.class)
     public void testWrongTlvType() {
-        this.handler.serializeBgpPrefixSidTlv(new BgpPrefixSidTlv() {
-            @Override
-            public Class<? extends DataContainer> getImplementedInterface() {
-                return BgpPrefixSidTlv.class;
-            }
-        }, Unpooled.EMPTY_BUFFER);
+        this.handler.serializeBgpPrefixSidTlv(() -> BgpPrefixSidTlv.class, Unpooled.EMPTY_BUFFER);
     }
 
     @Test
index fa91090ee21f69f74267bca531503ad524dfe70e..7e2b15160e586f75e1851ff4c8d72abfe4e64918 100644 (file)
@@ -157,7 +157,7 @@ public class BGPParserTest {
         assertNull(message.getNlri());
 
         // attributes
-        final List<AsNumber> asNumbers = new ArrayList<AsNumber>();
+        final List<AsNumber> asNumbers = new ArrayList<>();
         asNumbers.add(new AsNumber(65001L));
         final List<Segments> asPath = Lists.newArrayList();
         asPath.add(new SegmentsBuilder().setAsSequence(asNumbers).build());
index bbf8d4abc6ca81d8ee93194233593ed023b76afb..7cb98b90b84976d2a2818e91b9e26e71d3b37cf9 100644 (file)
@@ -95,7 +95,7 @@ public class Ipv4NlriParserTest {
                 new DestinationIpv4Builder().setIpv4Prefixes(this.prefixes).build()).build();
         this.ip4caseAD = new DestinationIpv4CaseBuilder().setDestinationIpv4(new DestinationIpv4Builder().setIpv4Prefixes(this.prefixes).build()).build();
 
-        final ArrayList<Ipv4Prefixes> fakePrefixes = new ArrayList<Ipv4Prefixes>(this.prefixes);
+        final ArrayList<Ipv4Prefixes> fakePrefixes = new ArrayList<>(this.prefixes);
         fakePrefixes.add(new Ipv4PrefixesBuilder().setPrefix(wrongPrefix).build());
         this.ip4caseWDWrong = new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev150305.update.attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationIpv4CaseBuilder().setDestinationIpv4(
                 new DestinationIpv4Builder().setIpv4Prefixes(fakePrefixes).build()).build();
index 42b1d8c898cbbe802bb85f4c5cb50d47e036c2de..4e05114aaf6891519fb980ecf1f516eba51de925 100644 (file)
@@ -29,7 +29,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.type
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.c.next.hop.Ipv6NextHopCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.c.next.hop.ipv4.next.hop._case.Ipv4NextHopBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.c.next.hop.ipv6.next.hop._case.Ipv6NextHopBuilder;
-import org.opendaylight.yangtools.yang.binding.DataContainer;
 
 public class NextHopParserSerializerTest {
 
@@ -81,12 +80,7 @@ public class NextHopParserSerializerTest {
     public void testSerializeIpv4NextHopEmpty() {
         buffer.clear();
         try {
-            ipv4NextHopParserSerializer.serializeNextHop(new CNextHop() {
-                @Override
-                public Class<? extends DataContainer> getImplementedInterface() {
-                    return null;
-                }
-            }, buffer);
+            ipv4NextHopParserSerializer.serializeNextHop(() -> null, buffer);
         } catch (final IllegalArgumentException e) {
             assertEquals("cNextHop is not a Ipv4 NextHop object.", e.getMessage());
         }
@@ -96,12 +90,7 @@ public class NextHopParserSerializerTest {
     public void testSerializeIpv6NextHopEmpty() {
         buffer.clear();
         try {
-            ipv6NextHopParserSerializer.serializeNextHop(new CNextHop() {
-                @Override
-                public Class<? extends DataContainer> getImplementedInterface() {
-                    return null;
-                }
-            }, buffer);
+            ipv6NextHopParserSerializer.serializeNextHop(() -> null, buffer);
         } catch (final IllegalArgumentException e) {
             assertEquals("cNextHop is not a Ipv6 NextHop object.", e.getMessage());
         }
index caaa0aa58963cafd4a6700fe298ef61eaa8aa272..63da734e7438a8edcbf12791d8823f9a2819f806 100644 (file)
@@ -35,7 +35,7 @@ final class OriginatorSrgbTlvParser implements BgpPrefixSidTlvParser, BgpPrefixS
 
     private static List<SrgbValue> parseSrgbs(final ByteBuf buffer) {
         Preconditions.checkState(buffer.readableBytes() % SRGB_LENGTH == 0, "Number of SRGBs doesn't fit available bytes.");
-        final List<SrgbValue> ret = new ArrayList<SrgbValue>();
+        final List<SrgbValue> ret = new ArrayList<>();
         while (buffer.isReadable()) {
             ret.add(new SrgbValueBuilder().setBase(new Srgb((long) buffer.readUnsignedMedium())).setRange(new Srgb((long) buffer.readUnsignedMedium())).build());
         }
index e0be13d7c9607a7e34e22d404ab8beb428e4325b..a6fbc624de1d878c9fe402a5a30a1344afae7668 100644 (file)
@@ -42,7 +42,7 @@ public final class BgpPrefixSidTlvsTest {
     @Test
     public void testOriginatorParser() {
         final OriginatorSrgbTlvParser parser = new OriginatorSrgbTlvParser();
-        final List<SrgbValue> list = new ArrayList<SrgbValue>();
+        final List<SrgbValue> list = new ArrayList<>();
 
         final Srgb srgb1 = new Srgb(1L);
         final Srgb srgb2 = new Srgb(2L);
index b869de691bb78fb623370e5286c4fceee28551e7..33be92d75416c8d2c518b0768dfaf6e1040a2566 100644 (file)
@@ -27,7 +27,7 @@ final class BGPConfigStateStoreImpl implements BGPConfigStateStore {
 
     @Override
     public <T extends DataObject> void registerBGPConfigHolder(final Class<T> clazz) {
-        configHolderMap.put(clazz, new BGPConfigHolderImpl<T>(OpenConfigComparatorFactory.getComparator(clazz)));
+        configHolderMap.put(clazz, new BGPConfigHolderImpl<>(OpenConfigComparatorFactory.getComparator(clazz)));
     }
 
 
index 4d9a0aab0d5f32cff54ac85ef7ca03c51c0b57f5..9409512371560488effacd471ce38e9dca11ce0d 100644 (file)
@@ -41,6 +41,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controll
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.rev130405.services.service.Instance;
 import org.opendaylight.yangtools.yang.binding.ChildOf;
 
+@SuppressWarnings("ALL")
 final class AddPathFunction {
 
     private AddPathFunction() {
index 5c535244b4952b9b009ebc0e07792ed4170cd432..6e9a27b3c186e1c4fa322ff60a487bb5ea350f74 100644 (file)
@@ -35,6 +35,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controll
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings("ALL")
 final class BGPAppPeerProvider {
 
     private static final String APPLICATION_RIB = "application-rib_";
index 243ca1a0ac8bf521c694a9cdf48560c8da305f66..3da73aa5261fe5311e854ad0f1245d57d25cd5be 100644 (file)
@@ -46,6 +46,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controll
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings("ALL")
 final class BGPPeerProvider {
 
     private static final String PEER = "peer_";
index 127675a20683d882de702b11e64eb4ca70347dfd..0090cd2b1bd5ddb0a6160e2361aefead84ec5188 100644 (file)
@@ -36,6 +36,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controll
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings("ALL")
 final class BGPRibImplProvider {
 
     private static final Logger LOG = LoggerFactory.getLogger(BGPRibImplProvider.class);
index 66d0c5d422cb0a75e6cae9db5c70b61809ca4ede..58347da252aa51f06b94fc700c42cb99a8279396 100644 (file)
@@ -24,6 +24,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controll
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.dom.rev131028.DomAsyncDataBroker;
 import org.opendaylight.yangtools.yang.binding.ChildOf;
 
+@SuppressWarnings("ALL")
 public final class DataBrokerFunction {
     private DataBrokerFunction() {
         throw new UnsupportedOperationException();
index 1906c970d278a3f8fd99b7d8e2b9b28e7f08555b..f101cca97d3d4e5ff85f1eb392196af4e550dddf 100644 (file)
@@ -44,6 +44,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controll
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.rev130405.services.service.Instance;
 import org.opendaylight.yangtools.yang.binding.ChildOf;
 
+@SuppressWarnings("ALL")
 final class PathSelectionModeFunction {
 
     private static final Map<String, Class<? extends ModuleType>> PATH_SELECTION_MODULE_TYPES;
index 2785462ebbc3625242087b601eb3118c396fef53..2b5a61c7c5a31426374cc10cdc004036bb3ed28c 100644 (file)
@@ -23,6 +23,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controll
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.rev130405.services.service.Instance;
 import org.opendaylight.yangtools.yang.binding.ChildOf;
 
+@SuppressWarnings("ALL")
 final class RibInstanceFunction {
     private RibInstanceFunction() {
         throw new UnsupportedOperationException();
index 9f509abe0810551c99343a4c427d63ac04357fa0..49872e869e670a88388942a5bcae80d0502adde6 100644 (file)
@@ -10,7 +10,6 @@ package org.opendaylight.protocol.bgp.openconfig.impl.moduleconfig;
 
 import com.google.common.base.Function;
 import com.google.common.base.Optional;
-import com.google.common.base.Predicate;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.ImmutableList;
 import java.util.ArrayList;
@@ -32,6 +31,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controll
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.rev130405.services.service.Instance;
 import org.opendaylight.yangtools.yang.binding.ChildOf;
 
+@SuppressWarnings("ALL")
 final class TableTypesFunction {
     private TableTypesFunction() {
         throw new UnsupportedOperationException();
@@ -54,17 +54,7 @@ final class TableTypesFunction {
                 }
 
                 final ImmutableList<Module> modules = FluentIterable.from(maybeModules)
-                    .filter(new Predicate<Optional<Module>>() {
-                        @Override
-                        public boolean apply(final Optional<Module> input) {
-                            return input.isPresent();
-                        }
-                    }).transform(new Function<Optional<Module>, Module>() {
-                        @Override
-                        public Module apply(final Optional<Module> input) {
-                            return input.get();
-                        }
-                    }).toList();
+                    .filter(Optional::isPresent).transform(Optional::get).toList();
 
                 return toServices(function, afiSafis, afiSafiToModuleName(afiSafis, modules), moduleNameToService);
             }
index a74f748d9ad22ccb104a2c2e1ac938a2726d9ade..fb0ed5e522f71f44c096681c6d50c59360feefd6 100644 (file)
@@ -23,7 +23,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controll
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.rev130405.modules.ModuleKey;
 
 public class BGPConfigHolderImplTest {
-    private static final BGPConfigHolderImpl<Bgp> HOLDER = new BGPConfigHolderImpl<Bgp>(OpenConfigComparatorFactory.getComparator(Bgp.class));
+    private static final BGPConfigHolderImpl<Bgp> HOLDER = new BGPConfigHolderImpl<>(OpenConfigComparatorFactory.getComparator(Bgp.class));
 
     @Test
     public void test() {
index 7412ab65e983409a9f31e061ca948b701a525292..f54b4e713141396dee30a4c7ac6585885ada3927 100644 (file)
@@ -87,7 +87,7 @@ public class BGPOpenConfigListenerTest {
 
         final Global global = Mockito.mock(Global.class);
         final Neighbors neighbors = Mockito.mock(Neighbors.class);
-        final ArrayList<Neighbor> neighbor = new ArrayList<Neighbor>();
+        final ArrayList<Neighbor> neighbor = new ArrayList<>();
         neighbor.add(createNeighbor());
         Mockito.doReturn(neighbor).when(neighbors).getNeighbor();
         Mockito.doReturn(neighbors).when(this.modif1).getDataAfter();
index 9745e46aa86063f5e5a37139fbc3697c7358d813..92cda51cb29f60268c862010c2042fe5821c1264 100644 (file)
@@ -92,7 +92,7 @@ public class BGPPeerProviderTest {
     }
 
     private Neighbor createNeighbor() {
-        final List<AfiSafi> families = new ArrayList<AfiSafi>();
+        final List<AfiSafi> families = new ArrayList<>();
         final AfiSafi afi = new AfiSafiBuilder().build();
         families.add(afi);
         return new NeighborBuilder()
index fd27e87e5f4efcfd94114c0fed7ae356075a6fdc..51ab2d073700e41078e506af2149bac43d856bb3 100644 (file)
@@ -103,7 +103,7 @@ public class BGPRibImplProviderTest {
 
     private Bgp createBgp() {
         final GlobalBuilder global = new GlobalBuilder();
-        final List<AfiSafi> families = new ArrayList<AfiSafi>();
+        final List<AfiSafi> families = new ArrayList<>();
         global.setAfiSafis(new AfiSafisBuilder().setAfiSafi(families).build())
             .setConfig(new ConfigBuilder()
                 .setRouterId(new Ipv4Address("1.1.1.1"))
index 576788d5ec6b0f08ba2adebade4fdfd8afca6d13..9b9c9fe4e476f45ec8430bf12c775ac37c6c331a 100644 (file)
@@ -25,6 +25,7 @@ import org.opendaylight.yangtools.concepts.Identifier;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
+@SuppressWarnings("ALL")
 public class AbstractBGPOpenConfigMapperTest {
 
     private static final InstanceConfigurationIdentifier IDENTIFIER = new InstanceConfigurationIdentifier("instanceName");
index f93232594bf427701e612c92b2a2a92f657dee58..84468742cd2aa1a23bf56589a070eda1b228083b 100644 (file)
@@ -51,7 +51,7 @@ public final class BgpPrefixSidAttributeParser implements AttributeParser, Attri
     @Override
     public void parseAttribute(final ByteBuf buffer, final AttributesBuilder builder) throws BGPDocumentedException, BGPParsingException {
         final BgpPrefixSidBuilder sid = new BgpPrefixSidBuilder();
-        final List<BgpPrefixSidTlvs> tlvList = new ArrayList<BgpPrefixSidTlvs>();
+        final List<BgpPrefixSidTlvs> tlvList = new ArrayList<>();
         while (buffer.isReadable()) {
             final BgpPrefixSidTlv tlv = this.reg.parseBgpPrefixSidTlv(buffer.readUnsignedByte(), buffer);
             tlvList.add(new BgpPrefixSidTlvsBuilder().setBgpPrefixSidTlv(tlv).build());
index cf0098c563ed4710548eb48260dd5e092d99f8e0..00de9ed556f158bde6092ed9beb6cfbb74354ae1 100644 (file)
@@ -64,7 +64,7 @@ public class AddPathCapabilityHandlerTest {
 
     @Test
     public void testCapabilityHandler() throws BGPDocumentedException, BGPParsingException {
-        final List<AddressFamilies> family = new ArrayList<AddressFamilies>();
+        final List<AddressFamilies> family = new ArrayList<>();
         family.add(new AddressFamiliesBuilder().setAfi(this.afi).setSafi(this.safi).setSendReceive(SendReceive.forValue(1)).build());
 
         final CParameters capabilityToSerialize = new CParametersBuilder().addAugmentation(CParameters1.class, new CParameters1Builder().setAddPathCapability(
@@ -96,7 +96,7 @@ public class AddPathCapabilityHandlerTest {
     @Test
     public void testSendReceiveIgnored() throws BGPDocumentedException, BGPParsingException {
         final CParameters capabilityToSerialize = new CParametersBuilder().addAugmentation(CParameters1.class, new CParameters1Builder().setAddPathCapability(
-            new AddPathCapabilityBuilder().setAddressFamilies(new ArrayList<AddressFamilies>()).build()).build()).build();
+            new AddPathCapabilityBuilder().setAddressFamilies(new ArrayList<>()).build()).build()).build();
 
         final ByteBuf bytes = this.parseWrongBytes.copy();
         final AddPathCapabilityHandler handler = new AddPathCapabilityHandler(this.afiRegistry, this.safiRegistry);
@@ -106,7 +106,7 @@ public class AddPathCapabilityHandlerTest {
 
     @Test(expected=IllegalArgumentException.class)
     public void testUnhandledAfi() {
-        final List<AddressFamilies> family = new ArrayList<AddressFamilies>();
+        final List<AddressFamilies> family = new ArrayList<>();
         family.add(new AddressFamiliesBuilder().setAfi(this.afi).setSafi(this.safi).setSendReceive(SendReceive.forValue(2)).build());
 
         final CParameters capabilityToSerialize = new CParametersBuilder().addAugmentation(CParameters1.class, new CParameters1Builder().setAddPathCapability(
@@ -119,7 +119,7 @@ public class AddPathCapabilityHandlerTest {
 
     @Test(expected=IllegalArgumentException.class)
     public void testUnhandledSafi() {
-        final List<AddressFamilies> family = new ArrayList<AddressFamilies>();
+        final List<AddressFamilies> family = new ArrayList<>();
         family.add(new AddressFamiliesBuilder().setAfi(this.afi).setSafi(this.safi).setSendReceive(SendReceive.forValue(3)).build());
 
         final CParameters capabilityToSerialize = new CParametersBuilder().addAugmentation(CParameters1.class, new CParameters1Builder().setAddPathCapability(
@@ -132,7 +132,7 @@ public class AddPathCapabilityHandlerTest {
 
     @Test(expected=IllegalArgumentException.class)
     public void testUnhandledSendReceive() {
-        final List<AddressFamilies> family = new ArrayList<AddressFamilies>();
+        final List<AddressFamilies> family = new ArrayList<>();
         family.add(new AddressFamiliesBuilder().setAfi(this.afi).setSafi(this.safi).setSendReceive(SendReceive.forValue(4)).build());
 
         final CParameters capabilityToSerialize = new CParametersBuilder().addAugmentation(CParameters1.class, new CParameters1Builder().setAddPathCapability(
index 0f1096578739640963535d4306218bc3029adb29..087055737ae916871f962749e0c6b3089e0c643e 100644 (file)
@@ -68,7 +68,7 @@ public class BGPParserTest {
     /**
      * Used by other tests as well
      */
-    static final List<byte[]> inputBytes = new ArrayList<byte[]>();
+    static final List<byte[]> inputBytes = new ArrayList<>();
 
     private static final int COUNTER = 7;
 
@@ -161,7 +161,7 @@ public class BGPParserTest {
         assertNull(message.getWithdrawnRoutes());
 
         // attributes
-        final List<AsNumber> asNumbers = new ArrayList<AsNumber>();
+        final List<AsNumber> asNumbers = new ArrayList<>();
         asNumbers.add(new AsNumber(65002L));
         final List<Segments> asPath = Lists.newArrayList();
         asPath.add(new SegmentsBuilder().setAsSequence(asNumbers).build());
@@ -283,7 +283,7 @@ public class BGPParserTest {
         assertNull(message.getWithdrawnRoutes());
 
         // attributes
-        final List<AsNumber> asNumbers = new ArrayList<AsNumber>();
+        final List<AsNumber> asNumbers = new ArrayList<>();
         asNumbers.add(new AsNumber(30L));
         final List<Segments> asPath = Lists.newArrayList();
         asPath.add(new SegmentsBuilder().setAsSequence(asNumbers).build());
index 85152dc46ba4cd7ad0aba520fee8b4320acbe34d..3a05df0c5ce28e11a464eda622d30aa61003b608 100644 (file)
@@ -58,7 +58,7 @@ final class SimpleAttributeRegistry implements AttributeRegistry {
     private final HandlerRegistry<DataContainer, AttributeParser, AttributeSerializer> handlers = new HandlerRegistry<>();
     private final Map<AbstractRegistration, AttributeSerializer> serializers = new LinkedHashMap<>();
     private final AtomicReference<Iterable<AttributeSerializer>> roSerializers =
-        new AtomicReference<Iterable<AttributeSerializer>>(this.serializers.values());
+        new AtomicReference<>(this.serializers.values());
     private final List<UnrecognizedAttributes> unrecognizedAttributes = new ArrayList<>();
 
 
index 363a932a2ed7c321e34a141f276badea66aecdba..957f331a3fb62503c74a88ce128ab5aa681f930d 100644 (file)
@@ -66,7 +66,7 @@ public class SimpleBGPExtensionProviderContext extends SimpleBGPExtensionConsume
         this.maximumCachedObjects = maximumCachedObjects;
 
         final Cache<Object, Object> cache = CacheBuilder.newBuilder().maximumSize(maximumCachedObjects).build();
-        this.cacheRef = new AtomicReference<Cache<Object,Object>>(cache);
+        this.cacheRef = new AtomicReference<>(cache);
     }
 
     @Override
index 4fafdcd1608104aa10bbadb63d8ecd3cc3a230a6..513e0e8ece29655e253269e18b167371442a41a8 100644 (file)
@@ -39,7 +39,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.open.message.BgpParameters;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.AttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.attributes.bgp.prefix.sid.bgp.prefix.sid.tlvs.BgpPrefixSidTlv;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.BgpTableType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.update.attributes.MpReachNlri;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.update.attributes.MpReachNlriBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.update.attributes.MpUnreachNlri;
@@ -54,12 +53,7 @@ import org.opendaylight.yangtools.yang.binding.Notification;
 
 public class SimpleRegistryTest {
 
-    private static final MultiPathSupport ADD_PATH_SUPPORT = new MultiPathSupport() {
-        @Override
-        public boolean isTableTypeSupported(final BgpTableType tableType) {
-            return true;
-        }
-    };
+    private static final MultiPathSupport ADD_PATH_SUPPORT = tableType -> true;
 
     private static final PeerSpecificParserConstraint CONSTRAINT = new PeerSpecificParserConstraint() {
         @Override
index c57ec00434daf3245d08c47f3d758836b4a83e3f..1cbd5b08e5bda3c873766168eb78b5631a77aaa4 100644 (file)
@@ -48,7 +48,7 @@ public class UnrecognizedAttributesTest {
         final List<UnrecognizedAttributes> unrecogAttribs = simpleAttrReg.parseAttributes(Unpooled.wrappedBuffer(attributeBytes)).getUnrecognizedAttributes();
         assertEquals(UNRECOGNIZED_ATTRIBUTE_COUNT, unrecogAttribs.size());
         final UnrecognizedAttributes unrecogAttrib = unrecogAttribs.get(FIRST_ATTRIBUTE);
-        final UnrecognizedAttributesKey expectedAttribKey = new UnrecognizedAttributesKey(unrecogAttrib.getType().shortValue());
+        final UnrecognizedAttributesKey expectedAttribKey = new UnrecognizedAttributesKey(unrecogAttrib.getType());
 
         assertTrue(unrecogAttrib.isPartial());
         assertTrue(unrecogAttrib.isTransitive());
index 51f25c84e2c70155d38df79b99427d3d20e44af2..a1931145f8fc13eb62f430600ccf2a54ade4a232 100644 (file)
@@ -17,7 +17,6 @@ import com.google.common.collect.ImmutableList;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import javax.annotation.concurrent.NotThreadSafe;
 import org.opendaylight.protocol.bgp.mode.api.BestPathState;
@@ -115,12 +114,7 @@ public final class BestPathStateImpl implements BestPathState {
     public BestPathStateImpl(final ContainerNode attributes) {
         final NamespaceSpecificIds col;
         try {
-            col = PATH_CACHE.get(attributes.getNodeType().getModule(), new Callable<NamespaceSpecificIds>() {
-                @Override
-                public NamespaceSpecificIds call() {
-                    return new NamespaceSpecificIds(attributes.getNodeType());
-                }
-            });
+            col = PATH_CACHE.get(attributes.getNodeType().getModule(), () -> new NamespaceSpecificIds(attributes.getNodeType()));
         } catch (final ExecutionException e) {
             LOG.error("Error creating namespace-specific attributes collection.", e);
             throw new IllegalStateException("Error creating namespace-specific attributes collection.", e);
index eaf5440f6575e32dd5750dd6b87d9a99b68f4fb8..aad20240bdcf26d80bd3d376414031028d790322 100644 (file)
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>testtool-util</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>
index e65c6a58460b1abf11f7cb94058897aedfe8d18e..c4212c8894ad36ff04ab157e46433a4192e28a1e 100755 (executable)
@@ -113,7 +113,7 @@ public final class RIBImplModule extends org.opendaylight.controller.config.yang
 
     private Map<TablesKey, PathSelectionMode> mapBestPathSelectionStrategyByFamily(final List<BGPBestPathSelection> bestPathSelectionDependency) {
         return Collections.unmodifiableMap(bestPathSelectionDependency.stream().collect(
-                Collectors.toMap(st -> new TablesKey(st.getAfi(), st.getSafi()), st -> st.getStrategy())));
+                Collectors.toMap(st -> new TablesKey(st.getAfi(), st.getSafi()), BGPBestPathSelection::getStrategy)));
     }
 
     private static interface AutoCloseableRIB extends RIB, AutoCloseable {
index 420e27e816e2d72bca18942107041fe4fc6d2b6b..cef181ab081f9f491a793992a493e7be62a0ee32 100644 (file)
@@ -11,7 +11,6 @@ package org.opendaylight.protocol.bgp.rib.impl;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import io.netty.channel.Channel;
-import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
@@ -117,17 +116,14 @@ abstract class AbstractBGPSessionNegotiator extends ChannelInboundHandlerAdapter
                 preferences.getBgpId()).setBgpParameters(preferences.getParams()).build());
             if (this.state != State.FINISHED) {
                 this.state = State.OPEN_SENT;
-                this.pending = this.channel.eventLoop().schedule(new Runnable() {
-                    @Override
-                    public void run() {
-                        synchronized (AbstractBGPSessionNegotiator.this) {
-                            AbstractBGPSessionNegotiator.this.pending = null;
-                            if (AbstractBGPSessionNegotiator.this.state != State.FINISHED) {
-                                AbstractBGPSessionNegotiator.this
-                                    .sendMessage(buildErrorNotify(BGPError.HOLD_TIMER_EXPIRED));
-                                negotiationFailed(new BGPDocumentedException("HoldTimer expired", BGPError.FSM_ERROR));
-                                AbstractBGPSessionNegotiator.this.state = State.FINISHED;
-                            }
+                this.pending = this.channel.eventLoop().schedule(() -> {
+                    synchronized (AbstractBGPSessionNegotiator.this) {
+                        AbstractBGPSessionNegotiator.this.pending = null;
+                        if (AbstractBGPSessionNegotiator.this.state != State.FINISHED) {
+                            AbstractBGPSessionNegotiator.this
+                                .sendMessage(buildErrorNotify(BGPError.HOLD_TIMER_EXPIRED));
+                            negotiationFailed(new BGPDocumentedException("HoldTimer expired", BGPError.FSM_ERROR));
+                            AbstractBGPSessionNegotiator.this.state = State.FINISHED;
                         }
                     }
                 }, INITIAL_HOLDTIMER, TimeUnit.MINUTES);
@@ -266,15 +262,12 @@ abstract class AbstractBGPSessionNegotiator extends ChannelInboundHandlerAdapter
     }
 
     private void sendMessage(final Notification msg) {
-        this.channel.writeAndFlush(msg).addListener(new ChannelFutureListener() {
-            @Override
-            public void operationComplete(final ChannelFuture f) {
-                if (!f.isSuccess()) {
-                    LOG.warn("Failed to send message {} to channel {}", msg,  AbstractBGPSessionNegotiator.this.channel, f.cause());
-                    negotiationFailedCloseChannel(f.cause());
-                } else {
-                    LOG.trace("Message {} sent to channel {}", msg, AbstractBGPSessionNegotiator.this.channel);
-                }
+        this.channel.writeAndFlush(msg).addListener((ChannelFutureListener) f -> {
+            if (!f.isSuccess()) {
+                LOG.warn("Failed to send message {} to channel {}", msg,  AbstractBGPSessionNegotiator.this.channel, f.cause());
+                negotiationFailedCloseChannel(f.cause());
+            } else {
+                LOG.trace("Message {} sent to channel {}", msg, AbstractBGPSessionNegotiator.this.channel);
             }
         });
     }
index 26a12fb4d4e9a17d5ec45cb001334f868714a32a..5a41cf2d368dc1261637af6d879eb3b2259b93d3 100644 (file)
@@ -43,14 +43,11 @@ public class BgpPeerRpc implements BgpPeerRpcService {
     public Future<RpcResult<Void>> routeRefreshRequest(final RouteRefreshRequestInput input) {
         final ChannelFuture f = sendRRMessage(input);
         if (f != null) {
-            return Futures.transform(JdkFutureAdapters.listenInPoolThread(f), new Function<Void, RpcResult<Void>>() {
-                @Override
-                public RpcResult<Void> apply(final Void input) {
-                    if (f.isSuccess()) {
-                        return RpcResultBuilder.<Void>success().build();
-                    } else {
-                        return RpcResultBuilder.<Void>failed().withError(ErrorType.RPC, FAILURE_MSG).build();
-                    }
+            return Futures.transform(JdkFutureAdapters.listenInPoolThread(f), (Function<Void, RpcResult<Void>>) input1 -> {
+                if (f.isSuccess()) {
+                    return RpcResultBuilder.<Void>success().build();
+                } else {
+                    return RpcResultBuilder.<Void>failed().withError(ErrorType.RPC, FAILURE_MSG).build();
                 }
             });
         }
index 26c10fc805fc783f7f384d3d5f7f4361ef0947f3..e4c010a68747e21ad5d3bf3d2e96dbfa55e996bc 100644 (file)
@@ -69,7 +69,7 @@ public final class BGPProtocolSessionPromise<S extends BGPSession> extends Defau
 
         final BGPProtocolSessionPromise lock = this;
         try {
-            LOG.debug("Promise {} attempting connect for {}ms", lock, Integer.valueOf(CONNECT_TIMEOUT));
+            LOG.debug("Promise {} attempting connect for {}ms", lock, CONNECT_TIMEOUT);
             if (this.address.isUnresolved()) {
                 this.address = new InetSocketAddress(this.address.getHostName(), this.address.getPort());
             }
index 1b67d2afa35385c829153b80b51d4cd9496d498a..65637fa37bcebbb6267e5f6abf6e60006853fb54 100644 (file)
@@ -29,7 +29,7 @@ public enum InstanceType {
     InstanceType(final String beanName, final List<Class<?>> services) {
         this.beanName = beanName;
         this.services = new String[services.size()];
-        services.stream().map(clazz -> clazz.getName()).collect(Collectors.toList()).toArray(this.services);
+        services.stream().map(Class::getName).collect(Collectors.toList()).toArray(this.services);
     }
 
     public String getBeanName() {
index 07bdf06f8e7a08a7d7f8efad930c2d94465d18de..4f5314ee022f1222c6abc47a0b8aeebe208dee6e 100644 (file)
@@ -37,7 +37,7 @@ public final class PerTableTypeRouteCounter {
     }
 
     public final synchronized void init(@Nonnull Set<TablesKey> tablesKeySet) {
-        tablesKeySet.stream().forEach(tablesKey -> init(tablesKey));
+        tablesKeySet.stream().forEach(this::init);
     }
 
     public final synchronized UnsignedInt32Counter init(@Nonnull final TablesKey tablesKey) {
@@ -80,6 +80,6 @@ public final class PerTableTypeRouteCounter {
 
     public final void resetAll() {
         LOG.debug("Resetting all route counters..");
-        this.counters.values().stream().forEach(v -> v.resetCount());
+        this.counters.values().stream().forEach(UnsignedInt32Counter::resetCount);
     }
 }
index 0b82eb12e5ef3e66c1ba9a6a3ea39972b9603b03..dbed972f0a3b71ed9a7453911eb46f80ee0f929d 100755 (executable)
@@ -163,7 +163,7 @@ public class BGPPeerModuleTest extends AbstractRIBImplModuleTest {
         mxBean2.setAddressFamily(AddPathImplModuleTest.createAddressFamily(transaction, "add-path-inst-2"));
         mxBean2.setSendReceive(SendReceive.Receive);
 
-        final List<ObjectName> ret = new ArrayList<ObjectName>();
+        final List<ObjectName> ret = new ArrayList<>();
         ret.add(name1);
         ret.add(name2);
         return ret;
index ceed3ee4a8422972e633f5e13292ab96b8018a70..01609a9de397b83a4e450ac68818d4c6d3f7f194 100644 (file)
@@ -37,8 +37,6 @@ import org.mockito.Matchers;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 import org.opendaylight.controller.config.yang.bgp.rib.impl.BgpSessionState;
 import org.opendaylight.protocol.bgp.parser.BGPDocumentedException;
 import org.opendaylight.protocol.bgp.parser.BGPError;
@@ -116,25 +114,19 @@ public class BGPSessionImplTest {
         final ChannelFuture f = mock(ChannelFuture.class);
         doReturn(null).when(f).addListener(Mockito.<GenericFutureListener<? extends Future<? super Void>>>any());
 
-        doAnswer(new Answer<Object>() {
-            @Override
-            public Object answer(final InvocationOnMock invocation) {
-                final Object[] args = invocation.getArguments();
-                BGPSessionImplTest.this.receivedMsgs.add((Notification) args[0]);
-                return f;
-            }
+        doAnswer(invocation -> {
+            final Object[] args = invocation.getArguments();
+            BGPSessionImplTest.this.receivedMsgs.add((Notification) args[0]);
+            return f;
         }).when(this.speakerListener).writeAndFlush(Mockito.any(Notification.class));
         doReturn(this.eventLoop).when(this.speakerListener).eventLoop();
         doReturn(true).when(this.speakerListener).isActive();
-        doAnswer(new Answer<Void>() {
-            @Override
-            public Void answer(final InvocationOnMock invocation) throws Throwable {
-                final Runnable command = (Runnable) invocation.getArguments()[0];
-                final long delay = (long) invocation.getArguments()[1];
-                final TimeUnit unit = (TimeUnit) invocation.getArguments()[2];
-                GlobalEventExecutor.INSTANCE.schedule(command, delay, unit);
-                return null;
-            }
+        doAnswer(invocation -> {
+            final Runnable command = (Runnable) invocation.getArguments()[0];
+            final long delay = (long) invocation.getArguments()[1];
+            final TimeUnit unit = (TimeUnit) invocation.getArguments()[2];
+            GlobalEventExecutor.INSTANCE.schedule(command, delay, unit);
+            return null;
         }).when(this.eventLoop).schedule(Mockito.any(Runnable.class), Mockito.any(long.class), Mockito.any(TimeUnit.class));
         doReturn("TestingChannel").when(this.speakerListener).toString();
         doReturn(true).when(this.speakerListener).isWritable();
@@ -172,8 +164,8 @@ public class BGPSessionImplTest {
         assertEquals(BGP_ID.getValue(), state.getLocalPeerPreferences().getBgpId().getValue());
         assertEquals(1, state.getLocalPeerPreferences().getAdvertizedTableTypes().size());
         assertEquals(HOLD_TIMER, state.getLocalPeerPreferences().getHoldtimer().intValue());
-        assertTrue(state.getLocalPeerPreferences().getFourOctetAsCapability().booleanValue());
-        assertTrue(state.getLocalPeerPreferences().getBgpExtendedMessageCapability().booleanValue());
+        assertTrue(state.getLocalPeerPreferences().getFourOctetAsCapability());
+        assertTrue(state.getLocalPeerPreferences().getBgpExtendedMessageCapability());
         assertTrue(state.getLocalPeerPreferences().getGrCapability());
         assertEquals(LOCAL_IP, new String(state.getRemotePeerPreferences().getHost().getValue()));
         assertEquals(LOCAL_PORT, state.getRemotePeerPreferences().getPort().getValue().intValue());
index 29d343afd6d3af2baf34703459ae3c96d7220123..a7ad6bcc1202afcfa8f7a14bfa537c4c2bfb5e46 100644 (file)
@@ -29,7 +29,7 @@ import org.opendaylight.yangtools.yang.common.RpcResult;
 
 public class BgpPeerRpcTest {
 
-    private final Set<TablesKey> supportedFamilies = new HashSet<TablesKey>();
+    private final Set<TablesKey> supportedFamilies = new HashSet<>();
     private final BGPSessionImpl session = Mockito.mock(BGPSessionImpl.class);
     private final BgpPeerRpc rpc = new BgpPeerRpc(this.session, this.supportedFamilies);
     private final PeerRef peer = Mockito.mock(PeerRef.class);
index c5bb5576dc55214bb95c54173ce1131a3c1a1e16..7aa31be9dc7f058c430ee356ba92cc06354ba8d3 100644 (file)
@@ -36,8 +36,6 @@ import org.junit.Test;
 import org.mockito.Matchers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 import org.opendaylight.protocol.bgp.parser.BGPError;
 import org.opendaylight.protocol.bgp.parser.BgpExtendedMessageUtil;
 import org.opendaylight.protocol.bgp.parser.BgpTableTypeImpl;
@@ -119,13 +117,10 @@ public class FSMTest {
         doReturn(null).when(f).addListener(any(GenericFutureListener.class));
 
         final InetAddress peerAddress = InetAddress.getByName("1.1.1.2");
-        doAnswer(new Answer<Object>() {
-            @Override
-            public Object answer(final InvocationOnMock invocation) {
-                final Object[] args = invocation.getArguments();
-                FSMTest.this.receivedMsgs.add((Notification) args[0]);
-                return f;
-            }
+        doAnswer(invocation -> {
+            final Object[] args = invocation.getArguments();
+            FSMTest.this.receivedMsgs.add((Notification) args[0]);
+            return f;
         }).when(this.speakerListener).writeAndFlush(any(Notification.class));
         doReturn(this.eventLoop).when(this.speakerListener).eventLoop();
         doReturn(null).when(this.eventLoop).schedule(any(Runnable.class), any(long.class), any(TimeUnit.class));
@@ -141,7 +136,7 @@ public class FSMTest {
         final BGPPeerRegistry peerRegistry = new StrictBGPPeerRegistry();
         peerRegistry.addPeer(new IpAddress(new Ipv4Address(peerAddress.getHostAddress())), new SimpleSessionListener(), prefs);
 
-        this.clientSession = new BGPClientSessionNegotiator(new DefaultPromise<BGPSessionImpl>(GlobalEventExecutor.INSTANCE), this.speakerListener, peerRegistry);
+        this.clientSession = new BGPClientSessionNegotiator(new DefaultPromise<>(GlobalEventExecutor.INSTANCE), this.speakerListener, peerRegistry);
 
         this.classicOpen = new OpenBuilder().setMyAsNumber(30).setHoldTimer(3).setVersion(new ProtocolVersion((short) 4)).setBgpParameters(
             tlvs).setBgpIdentifier(new Ipv4Address("1.1.1.2")).build();
@@ -149,7 +144,7 @@ public class FSMTest {
 
     @Test
     public void testDenyPeer() {
-        this.clientSession = new BGPClientSessionNegotiator(new DefaultPromise<BGPSessionImpl>(GlobalEventExecutor.INSTANCE), this.speakerListener, new StrictBGPPeerRegistry());
+        this.clientSession = new BGPClientSessionNegotiator(new DefaultPromise<>(GlobalEventExecutor.INSTANCE), this.speakerListener, new StrictBGPPeerRegistry());
         this.clientSession.channelActive(null);
         assertEquals(1, this.receivedMsgs.size());
         assertTrue(this.receivedMsgs.get(0) instanceof Notify);
index b7d07ebf8d016fbf8efe0762d78c8715f54d95b4..8f9cbde479afce94556626e45ee51fe79db482d5 100644 (file)
@@ -80,6 +80,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType;
 
+@SuppressWarnings("ALL")
 public class PeerTest extends AbstractRIBTestSetup {
 
     private ApplicationPeer peer;
index 619a210563029cfde0ae8fb238374a90871af52a..cedc7c2f7204683f34ac708886bb658811506c5a 100644 (file)
@@ -40,8 +40,6 @@ import org.junit.Test;
 import org.mockito.Matchers;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataTreeChangeService;
@@ -148,15 +146,12 @@ public class SynchronizationAndExceptionTest extends AbstractAddPathTest {
         doReturn(null).when(mock(ChannelFuture.class)).addListener(any());
         doReturn(this.eventLoop).when(this.speakerListener).eventLoop();
         doReturn(true).when(this.speakerListener).isActive();
-        doAnswer(new Answer<Void>() {
-            @Override
-            public Void answer(final InvocationOnMock invocation) throws Throwable {
-                final Runnable command = (Runnable) invocation.getArguments()[0];
-                final long delay = (long) invocation.getArguments()[1];
-                final TimeUnit unit = (TimeUnit) invocation.getArguments()[2];
-                GlobalEventExecutor.INSTANCE.schedule(command, delay, unit);
-                return null;
-            }
+        doAnswer(invocation -> {
+            final Runnable command = (Runnable) invocation.getArguments()[0];
+            final long delay = (long) invocation.getArguments()[1];
+            final TimeUnit unit = (TimeUnit) invocation.getArguments()[2];
+            GlobalEventExecutor.INSTANCE.schedule(command, delay, unit);
+            return null;
         }).when(this.eventLoop).schedule(any(Runnable.class), any(long.class), any(TimeUnit.class));
         doReturn("TestingChannel").when(this.speakerListener).toString();
         doReturn(true).when(this.speakerListener).isWritable();
@@ -185,13 +180,10 @@ public class SynchronizationAndExceptionTest extends AbstractAddPathTest {
             any(YangInstanceIdentifier.class), any(NormalizedNode.class));
         Mockito.doNothing().when(this.tx).delete(Mockito.any(LogicalDatastoreType.class), Mockito.any(YangInstanceIdentifier.class));
         final CheckedFuture future = mock(CheckedFuture.class);
-        Mockito.doAnswer(new Answer<Void>() {
-            @Override
-            public Void answer(final InvocationOnMock invocation) throws Throwable {
-                final Runnable callback = (Runnable) invocation.getArguments()[0];
-                callback.run();
-                return null;
-            }
+        Mockito.doAnswer(invocation -> {
+            final Runnable callback = (Runnable) invocation.getArguments()[0];
+            callback.run();
+            return null;
         }).when(future).addListener(Mockito.any(Runnable.class), Mockito.any(Executor.class));
         Mockito.doReturn(future).when(this.tx).submit();
         Mockito.doReturn(mock(Optional.class)).when(future).checkedGet();
index 569ca3d7ee5a63ff2d2e857743ba2764f8a57b65..3e438f6990b0ede473c37f771048a4579cdf99fc 100644 (file)
@@ -23,8 +23,6 @@ import org.junit.Before;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionChainListener;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataTreeChangeService;
@@ -116,13 +114,10 @@ class AbstractConfig {
         Mockito.doNothing().when(this.domDW).delete(eq(LogicalDatastoreType.OPERATIONAL), any(YangInstanceIdentifier.class));
         Mockito.doNothing().when(this.domDW).merge(eq(LogicalDatastoreType.OPERATIONAL), any(YangInstanceIdentifier.class), any(NormalizedNode.class));
         final CheckedFuture checkedFuture = mock(CheckedFuture.class);
-        Mockito.doAnswer(new Answer<Void>() {
-            @Override
-            public Void answer(final InvocationOnMock invocation) throws Throwable {
-                final Runnable callback = (Runnable) invocation.getArguments()[0];
-                callback.run();
-                return null;
-            }
+        Mockito.doAnswer(invocation -> {
+            final Runnable callback = (Runnable) invocation.getArguments()[0];
+            callback.run();
+            return null;
         }).when(checkedFuture).addListener(Mockito.any(Runnable.class), Mockito.any(Executor.class));
         Mockito.doReturn(checkedFuture).when(this.domDW).submit();
         Mockito.doReturn(null).when(checkedFuture).checkedGet();
index 1d78d86497b8654fa96fb69acaad28ea0321ad47..b8412ab7d4556c5f8b0cb313ff259338198e79a6 100644 (file)
@@ -96,7 +96,8 @@ public class BgpPeerTest extends AbstractConfig {
         Mockito.verify(this.render).getConfiguredPeerCounter();
         Mockito.verify(this.configurationWriter).apply();
         Mockito.verify(this.bgpPeerRegistry).addPeer(any(), any(), any());
-        Mockito.verify(this.dispatcher).createReconnectingClient(any(InetSocketAddress.class), any(BGPPeerRegistry.class), anyInt(), any(Optional.class));
+        Mockito.verify(this.dispatcher).createReconnectingClient(any(InetSocketAddress.class),
+            any(BGPPeerRegistry.class), anyInt(), any(Optional.class));
 
         try {
             this.bgpPeer.start(this.rib, neighbor, this.mappingService, this.configurationWriter);
index 207e6306f156d26251746cbfdd4bfa20e5a18959..cf1aff7a683fc2ba49f6c10434875a21b9a7383d 100644 (file)
@@ -24,15 +24,12 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataTreeChangeService;
 import org.opendaylight.controller.sal.core.api.model.SchemaService;
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTreeFactory;
 import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonService;
 import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceRegistration;
 import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier;
 import org.opendaylight.protocol.bgp.mode.impl.add.all.paths.AllPathSelection;
 import org.opendaylight.protocol.bgp.openconfig.spi.BGPOpenConfigMappingService;
@@ -95,12 +92,9 @@ public class RibImplTest extends AbstractConfig {
     @Before
     public void setUp() throws Exception {
         super.setUp();
-        Mockito.doAnswer(new Answer<ClusterSingletonServiceRegistration>() {
-            @Override
-            public ClusterSingletonServiceRegistration answer(final InvocationOnMock invocationOnMock) throws Throwable {
-                RibImplTest.this.singletonService = (ClusterSingletonService) invocationOnMock.getArguments()[0];
-                return RibImplTest.this.singletonServiceRegistration;
-            }
+        Mockito.doAnswer(invocationOnMock -> {
+            RibImplTest.this.singletonService = (ClusterSingletonService) invocationOnMock.getArguments()[0];
+            return RibImplTest.this.singletonServiceRegistration;
         }).when(this.clusterSingletonServiceProvider).registerClusterSingletonService(any(ClusterSingletonService.class));
 
         Mockito.doReturn(Collections.singletonMap(TABLE_TYPE, new AllPathSelection()))
index 6bc857d6516644ef2794ee5e8315ade344d0f13b..7f7f7287618c0b29b8c697b85f66875848137175 100644 (file)
@@ -21,8 +21,6 @@ import org.junit.Before;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction;
@@ -91,22 +89,16 @@ public abstract class AbstractRIBSupportTest {
     @Before
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
-        Mockito.doAnswer(new Answer<Object>() {
-            @Override
-            public Object answer(final InvocationOnMock invocation) throws Throwable {
-                final Object[] args = invocation.getArguments();
-                AbstractRIBSupportTest.this.insertedRoutes.add(mappingService.fromNormalizedNode((YangInstanceIdentifier) args[1], (NormalizedNode<?, ?>) args[2]));
-                return args[1];
-            }
+        Mockito.doAnswer(invocation -> {
+            final Object[] args = invocation.getArguments();
+            AbstractRIBSupportTest.this.insertedRoutes.add(AbstractRIBSupportTest.this.mappingService.fromNormalizedNode((YangInstanceIdentifier) args[1], (NormalizedNode<?, ?>) args[2]));
+            return args[1];
         }).when(this.tx).put(Mockito.any(LogicalDatastoreType.class), Mockito.any(YangInstanceIdentifier.class), Mockito.any(NormalizedNode.class));
 
-        Mockito.doAnswer(new Answer<Object>() {
-            @Override
-            public Object answer(final InvocationOnMock invocation) throws Throwable {
-                final Object[] args = invocation.getArguments();
-                AbstractRIBSupportTest.this.deletedRoutes.add(mappingService.fromYangInstanceIdentifier((YangInstanceIdentifier) args[1]));
-                return args[1];
-            }
+        Mockito.doAnswer(invocation -> {
+            final Object[] args = invocation.getArguments();
+            AbstractRIBSupportTest.this.deletedRoutes.add(AbstractRIBSupportTest.this.mappingService.fromYangInstanceIdentifier((YangInstanceIdentifier) args[1]));
+            return args[1];
         }).when(this.tx).delete(Mockito.any(LogicalDatastoreType.class), Mockito.any(YangInstanceIdentifier.class));
         this.deletedRoutes = new ArrayList<>();
         this.insertedRoutes = new ArrayList<>();
index 97434d79165d4823b4e1fa918a0731c8afcc6bbf..30f16db62cbd9babfe6c30219b2fbd5b5c89ab06 100644 (file)
@@ -205,7 +205,7 @@ public class LinkstateTopologyBuilder extends AbstractTopologyBuilder<LinkstateR
             }
 
             // Re-generate termination points
-            this.nb.setTerminationPoint(Lists.newArrayList(Collections2.transform(this.tps.values(), input -> input.getTp())));
+            this.nb.setTerminationPoint(Lists.newArrayList(Collections2.transform(this.tps.values(), TpHolder::getTp)));
 
             // Re-generate prefixes
             this.inab.setPrefix(Lists.newArrayList(this.prefixes.values()));
index 4071d6eaefd54ec727456538a0b120edb68ee9c8..9f0c003898acfeaad59f4d13eb83ab16ff71817f 100644 (file)
@@ -34,6 +34,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
 import org.osgi.framework.BundleContext;
 
+@SuppressWarnings("ALL")
 public final class BackwardsCssTopologyProvider {
 
     public static TopologyReferenceSingletonService createBackwardsCssInstance(final TopologyTypes topologyTypes, final TopologyId topologyId, final DataBroker dataBroker, final BundleContext bundleContext,
index 0f60733349a589a840d6148221a975e3e445b608..2e04675560a18ee32d946b2e3a4fb3e32b6b6888 100644 (file)
@@ -46,7 +46,7 @@ public class UriBuilderTest {
         final UriBuilder c = new UriBuilder(b, "foo");
         assertEquals("bgpls://1:Direct:10/type=foo", c.toString());
 
-        a.add("foo", new Long(25L));
+        a.add("foo", 25L);
         assertEquals("bgpls://Direct:10/&foo=25", a.toString());
 
         final LinkCaseBuilder linkB = new LinkCaseBuilder();
index 5bf7a6b5ac5601d13fa0a568b24412d215d8f15b..3bc83cf284e19b2a97e77f3524f185b38f04c315 100644 (file)
@@ -31,6 +31,7 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.
 import org.opendaylight.yangtools.concepts.AbstractRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
+@SuppressWarnings("ALL")
 public class Ipv4ReachabilityTopologyBuilderModuleTest extends AbstractRIBImplModuleTest {
 
     private static final String FACTORY_NAME = Ipv4ReachabilityTopologyBuilderModuleFactory.NAME;
index b4ab507ece4d82d7e268ce14a3ad940e5d13d398..59e5640873b8ef46d374d0bb84e0696e3d5f4823 100644 (file)
@@ -31,6 +31,7 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.
 import org.opendaylight.yangtools.concepts.AbstractRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
+@SuppressWarnings("ALL")
 public class Ipv6ReachabilityTopologyBuilderModuleTest extends AbstractRIBImplModuleTest {
 
     private static final String FACTORY_NAME = Ipv6ReachabilityTopologyBuilderModuleFactory.NAME;
index 3fa6433372a2f28dda9ebe5858e18f0c61552648..8507dc806327523f05ff7e568fb3e3fb570e5170 100644 (file)
@@ -29,6 +29,7 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.
 import org.opendaylight.yangtools.concepts.AbstractRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
+@SuppressWarnings("ALL")
 public class LinkstateTopologyBuilderModuleTest extends AbstractRIBImplModuleTest {
 
     private static final String FACTORY_NAME = LinkstateTopologyBuilderModuleFactory.NAME;
index 3453972e79cf10399ec7d9759367fa5a56ccad6f..220c559e7c9f6a56215e2541dc964bc7521ad157 100644 (file)
@@ -49,7 +49,7 @@ public class BandwidthTest {
 
     @Test
     public void testHashCode() {
-        final Set<Bandwidth> set = new HashSet<Bandwidth>();
+        final Set<Bandwidth> set = new HashSet<>();
 
         set.add(this.b1);
         assertEquals(1, set.size());
index 8afd6c7ed27b75b91a5281582d5d2e85b8fdb276..020688999ddd1954f0ff33a8780df4c228b84519 100644 (file)
@@ -32,7 +32,7 @@ public class MultiRegistryTest {
 
         assertEquals(Integer.valueOf(22), registry.get("second"));
 
-        registry.register(Character.valueOf('c'), 5);
+        registry.register('c', 5);
 
         assertEquals(Integer.valueOf(5), registry.get('c'));
 
@@ -46,14 +46,14 @@ public class MultiRegistryTest {
         final MultiRegistry<Object, Number> registry = new MultiRegistry<>();
         final String first = "first";
 
-        registry.register(first, new Integer(1));
-        assertEquals(Integer.valueOf(1), registry.get("first"));
+        registry.register(first, 1);
+        assertEquals(1, registry.get("first"));
 
-        registry.register(first, new Short((short) 1));
-        assertEquals(Integer.valueOf(1), registry.get("first"));
+        registry.register(first, (short) 1);
+        assertEquals(1, registry.get("first"));
 
-        registry.register(first, new Short((short) 2));
-        assertEquals(Integer.valueOf(1), registry.get("first"));
+        registry.register(first, (short) 2);
+        assertEquals(1, registry.get("first"));
     }
 
     @Test
@@ -62,20 +62,20 @@ public class MultiRegistryTest {
         final String first = "first";
         final String second = "second";
 
-        registry.register(first, new Integer(1));
-        assertEquals(Integer.valueOf(1), registry.get("first"));
+        registry.register(first, 1);
+        assertEquals(1, registry.get("first"));
 
-        registry.register(first, new Character('1'));
-        assertEquals(Integer.valueOf(1), registry.get("first"));
+        registry.register(first, '1');
+        assertEquals(1, registry.get("first"));
 
-        registry.register(second, new Character('2'));
-        assertEquals(Character.valueOf('2'), registry.get("second"));
+        registry.register(second, '2');
+        assertEquals('2', registry.get("second"));
 
-        registry.register(second, new Integer(2));
-        assertEquals(Character.valueOf('2'), registry.get("second"));
+        registry.register(second, 2);
+        assertEquals('2', registry.get("second"));
 
         registry.register(second, new Object());
-        assertEquals(Character.valueOf('2'), registry.get("second"));
+        assertEquals('2', registry.get("second"));
     }
 
 }
index a936f019c5e65f4d638aeacf38d261fa15119c6c..e8e8edc0971b38f4d190de5a3edca0548879e586 100755 (executable)
@@ -45,7 +45,7 @@ public class DataChangeCounterImplModule extends org.opendaylight.controller.con
         final InstanceIdentifier<Topology> topoIId = InstanceIdentifier.builder(NetworkTopology.class)
                 .child(Topology.class, new TopologyKey(new TopologyId(getTopologyName()))).build();
         final ListenerRegistration<TopologyDataChangeCounter> registration = getDataProviderDependency().registerDataTreeChangeListener(
-                new DataTreeIdentifier<Topology>(LogicalDatastoreType.OPERATIONAL, topoIId), counter);
+            new DataTreeIdentifier<>(LogicalDatastoreType.OPERATIONAL, topoIId), counter);
         return new DataChangeCounterCloseable(counter, registration);
     }
 
index aea1087f6c92b67114b4c1efd247476a1e1c6520..95bfefae9dc7e04e5191db015b83c445ce1ec38e 100644 (file)
@@ -151,7 +151,7 @@ public class DataChangeCounterImplModuleTest extends AbstractConfigTest {
 
         @Override
         public Set<Class<? extends AbstractServiceInterface>> getImplementedServiceIntefaces() {
-            final java.util.Set<Class<? extends org.opendaylight.controller.config.api.annotations.AbstractServiceInterface>> serviceIfcs2 = new java.util.HashSet<Class<? extends org.opendaylight.controller.config.api.annotations.AbstractServiceInterface>>();
+            final java.util.Set<Class<? extends org.opendaylight.controller.config.api.annotations.AbstractServiceInterface>> serviceIfcs2 = new java.util.HashSet<>();
             return java.util.Collections.unmodifiableSet(serviceIfcs2);
         }
 
index 61f4921fb0dbd14eb19970e29ac779c88d99a728..3290b90894461253a655e6fed2e95d433cc79df0 100644 (file)
@@ -90,7 +90,7 @@ public class PcRptMessageCodecTest {
         final LspIdentifiers identifier = new LspIdentifiersBuilder().setAddressFamily(afiLsp).setLspId(lspId).setTunnelId(tunnelId).build();
         final Lsp lsp = new LspBuilder().setPlspId(new PlspId(1L)).setTlvs(new TlvsBuilder().setLspIdentifiers(identifier).build()).build();
         final Ero ero = new EroBuilder().build();
-        final List<Object> objects = Lists.<Object>newArrayList(lsp, ero, bw);
+        final List<Object> objects = Lists.newArrayList(lsp, ero, bw);
         final Reports validReports = codec.getValidReports(objects, Collections.emptyList());
         assertNotNull(validReports.getPath().getBandwidth().getAugmentation(Bandwidth1.class));
         assertTrue(objects.isEmpty());
index 64d000d216affa80ea5d85d762e692320b4209d2..a2404346e54309ce1b5a2ced23f6a12400cb4792 100644 (file)
@@ -98,7 +98,7 @@ public class PCEPErrorMessageParser extends AbstractMessageParser {
         } else if (obj instanceof Rp) {
             final Rp o = (Rp) obj;
             if (o.isProcessingRule()) {
-                errors.add(createErrorMsg(PCEPErrors.P_FLAG_NOT_SET, Optional.<Rp>absent()));
+                errors.add(createErrorMsg(PCEPErrors.P_FLAG_NOT_SET, Optional.absent()));
                 return null;
             }
             requestParameters.add(new RpsBuilder().setRp(o).build());
index 4fafc27ca3c4f8aa7e9ed4c1f8b7743896c64cca..81e4def6db6f54e5a24436d6777c53369fa42370 100644 (file)
@@ -96,7 +96,7 @@ public class PCEPMonitoringReplyMessageParser extends AbstractMessageParser {
             throw new PCEPDeserializerException("Pcmonrep message cannot be empty.");
         }
         if (!(objects.get(0) instanceof Monitoring)) {
-            errors.add(createErrorMsg(PCEPErrors.MONITORING_OBJECT_MISSING, Optional.<Rp>absent()));
+            errors.add(createErrorMsg(PCEPErrors.MONITORING_OBJECT_MISSING, Optional.absent()));
             return null;
         }
         final PcmonrepMessageBuilder builder = new PcmonrepMessageBuilder();
index fc084e53d9db0f31e8ffc11199bf86326af86476..b3cbdf4a250b07025e8fca627b282ea238c631b1 100644 (file)
@@ -114,7 +114,7 @@ public class PCEPNotificationMessageParser extends AbstractMessageParser {
             if (obj instanceof Rp) {
                 final Rp rp = (Rp) obj;
                 if (rp.isProcessingRule()) {
-                    errors.add(createErrorMsg(PCEPErrors.P_FLAG_NOT_SET, Optional.<Rp>absent()));
+                    errors.add(createErrorMsg(PCEPErrors.P_FLAG_NOT_SET, Optional.absent()));
                     return null;
                 }
                 requestParameters.add(new RpsBuilder().setRp(rp).build());
index f174296fbc91a7ab80f8cb872e41e730db38c791..e02439973aa9db4083e01cadf44a97441c09f867 100644 (file)
@@ -167,7 +167,7 @@ public class PCEPReplyMessageParser extends AbstractMessageParser {
     protected Replies getValidReply(final List<Object> objects, final List<Message> errors) throws PCEPDeserializerException {
         Object object = objects.remove(0);
         if (!(object instanceof Rp)) {
-            errors.add(createErrorMsg(PCEPErrors.RP_MISSING, Optional.<Rp>absent()));
+            errors.add(createErrorMsg(PCEPErrors.RP_MISSING, Optional.absent()));
             return null;
         }
         final Rp rp = (Rp) object;
index 3f93e7e1e92ca886e1f29954ea6f13b06f860c97..18d1d2dfd654d733e2decb93e06d5935f0846a87 100644 (file)
@@ -168,7 +168,7 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
         if (requests != null) {
             mBuilder.setRequests(requests);
         } else {
-            errors.add(createErrorMsg(PCEPErrors.RP_MISSING, Optional.<Rp>absent()));
+            errors.add(createErrorMsg(PCEPErrors.RP_MISSING, Optional.absent()));
         }
         if (!objects.isEmpty()) {
             throw new PCEPDeserializerException("Unprocessed Objects: " + objects);
@@ -196,13 +196,13 @@ public class PCEPRequestMessageParser extends AbstractMessageParser {
             Rp rpObj = null;
             if (!(objects.get(0) instanceof Rp)) {
                 // if RP obj is missing return error only
-                errors.add(createErrorMsg(PCEPErrors.RP_MISSING, Optional.<Rp>absent()));
+                errors.add(createErrorMsg(PCEPErrors.RP_MISSING, Optional.absent()));
                 return null;
             }
             rpObj = (Rp) objects.get(0);
             objects.remove(0);
             if (!rpObj.isProcessingRule()) {
-                errors.add(createErrorMsg(PCEPErrors.P_FLAG_NOT_SET, Optional.<Rp>absent()));
+                errors.add(createErrorMsg(PCEPErrors.P_FLAG_NOT_SET, Optional.absent()));
             } else {
                 rBuilder.setRp(rpObj);
             }
index 41d7c164aa058002aba15d4f42e4f14fcb62601a..255d3269168e7f07177ea0f1ed795c732fed409e 100644 (file)
@@ -64,6 +64,6 @@ public final class Util {
     }
 
     private enum State {
-        START, PROC_TIME, OVERLOAD, END;
+        START, PROC_TIME, OVERLOAD, END
     }
 }
index 343bbd3feca337b70456606a0a87896ca1f61560..2f6b8a043d2d56659274eb39d8d6da3a54f650d0 100644 (file)
@@ -56,9 +56,9 @@ public final class PathBindingTlvParser implements TlvParser, TlvSerializer {
     static {
         final MplsLabelCodec mplsLabelCodec = new MplsLabelCodec();
         final MplsLabelEntryCodec mplsLabelEntryCodec = new MplsLabelEntryCodec();
-        final Builder<Integer, PathBindingTlvCodec> parsers = ImmutableMap.<Integer, PathBindingTlvCodec>builder();
+        final Builder<Integer, PathBindingTlvCodec> parsers = ImmutableMap.builder();
         final Builder<Class<? extends BindingTypeValue>, PathBindingTlvCodec> serializers =
-                ImmutableMap.<Class<? extends BindingTypeValue>, PathBindingTlvCodec>builder();
+                ImmutableMap.builder();
 
         parsers.put(mplsLabelCodec.getBindingType(), mplsLabelCodec);
         serializers.put(MplsLabel.class, mplsLabelCodec);
index 48ae2a56759ff78683fd9de5cd91c5efd209e665..aeb91de6d3a0e0bbfa99b36391e15eca8a4117f8 100644 (file)
@@ -85,7 +85,7 @@ public final class Stateful07ErrorMessageParser extends PCEPErrorMessageParser {
         } else if (obj instanceof Rp) {
             final Rp o = (Rp) obj;
             if (o.isProcessingRule()) {
-                errors.add(createErrorMsg(PCEPErrors.P_FLAG_NOT_SET, Optional.<Rp>absent()));
+                errors.add(createErrorMsg(PCEPErrors.P_FLAG_NOT_SET, Optional.absent()));
                 return null;
             }
             requestParameters.add(new RpsBuilder().setRp(o).build());
index 06a8ea0f7f16e2f176f3349eb37181d1e1560e4c..314432144145f84fc8eb725305c820bcfcb1c4f4 100644 (file)
@@ -10,7 +10,6 @@ package org.opendaylight.protocol.pcep.impl;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import io.netty.channel.Channel;
-import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
 import io.netty.handler.ssl.SslHandler;
 import io.netty.util.concurrent.Promise;
@@ -148,31 +147,28 @@ public abstract class AbstractPCEPSessionNegotiator extends AbstractSessionNegot
     }
 
     private void scheduleFailTimer() {
-        this.failTimer = this.channel.eventLoop().schedule(new Runnable() {
-            @Override
-            public void run() {
-                switch (AbstractPCEPSessionNegotiator.this.state) {
-                case FINISHED:
-                case IDLE:
-                    break;
-                case START_TLS_WAIT:
-                    sendErrorMessage(PCEPErrors.STARTTLS_TIMER_EXP);
-                    negotiationFailed(new TimeoutException("StartTLSWait timer expired"));
-                    AbstractPCEPSessionNegotiator.this.state = State.FINISHED;
-                    break;
-                case KEEP_WAIT:
-                    sendErrorMessage(PCEPErrors.NO_MSG_BEFORE_EXP_KEEPWAIT);
-                    negotiationFailed(new TimeoutException("KeepWait timer expired"));
-                    AbstractPCEPSessionNegotiator.this.state = State.FINISHED;
-                    break;
-                case OPEN_WAIT:
-                    sendErrorMessage(PCEPErrors.NO_OPEN_BEFORE_EXP_OPENWAIT);
-                    negotiationFailed(new TimeoutException("OpenWait timer expired"));
-                    AbstractPCEPSessionNegotiator.this.state = State.FINISHED;
-                    break;
-                default:
-                    break;
-                }
+        this.failTimer = this.channel.eventLoop().schedule((Runnable) () -> {
+            switch (AbstractPCEPSessionNegotiator.this.state) {
+            case FINISHED:
+            case IDLE:
+                break;
+            case START_TLS_WAIT:
+                sendErrorMessage(PCEPErrors.STARTTLS_TIMER_EXP);
+                negotiationFailed(new TimeoutException("StartTLSWait timer expired"));
+                AbstractPCEPSessionNegotiator.this.state = State.FINISHED;
+                break;
+            case KEEP_WAIT:
+                sendErrorMessage(PCEPErrors.NO_MSG_BEFORE_EXP_KEEPWAIT);
+                negotiationFailed(new TimeoutException("KeepWait timer expired"));
+                AbstractPCEPSessionNegotiator.this.state = State.FINISHED;
+                break;
+            case OPEN_WAIT:
+                sendErrorMessage(PCEPErrors.NO_OPEN_BEFORE_EXP_OPENWAIT);
+                negotiationFailed(new TimeoutException("OpenWait timer expired"));
+                AbstractPCEPSessionNegotiator.this.state = State.FINISHED;
+                break;
+            default:
+                break;
             }
         }, FAIL_TIMER_VALUE, TimeUnit.SECONDS);
     }
@@ -188,12 +184,7 @@ public abstract class AbstractPCEPSessionNegotiator extends AbstractSessionNegot
         } else {
             startNegotiationWithOpen();
         }
-        this.channel.closeFuture().addListener(new ChannelFutureListener() {
-            @Override
-            public void operationComplete(final ChannelFuture f) {
-                cancelTimers();
-            }
-        });
+        this.channel.closeFuture().addListener((ChannelFutureListener) f -> cancelTimers());
     }
 
     private void cancelTimers() {
index 690fe6425f0008fd550e83914d799b6484a52d2b..2fdbc724555c0732b30e293bb2e1bde7aafe628f 100644 (file)
@@ -9,7 +9,6 @@ package org.opendaylight.protocol.pcep.impl;
 
 import com.google.common.base.Preconditions;
 import io.netty.channel.Channel;
-import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
@@ -43,17 +42,14 @@ public abstract class AbstractSessionNegotiator extends ChannelInboundHandlerAda
     }
 
     protected final void sendMessage(final Message msg) {
-        this.channel.writeAndFlush(msg).addListener(new ChannelFutureListener() {
-            @Override
-            public void operationComplete(final ChannelFuture f) {
-                if (!f.isSuccess()) {
-                    LOG.info("Failed to send message {}", msg, f.cause());
-                    negotiationFailed(f.cause());
-                } else {
-                    LOG.trace("Message {} sent to socket", msg);
-                }
-
+        this.channel.writeAndFlush(msg).addListener((ChannelFutureListener) f -> {
+            if (!f.isSuccess()) {
+                LOG.info("Failed to send message {}", msg, f.cause());
+                negotiationFailed(f.cause());
+            } else {
+                LOG.trace("Message {} sent to socket", msg);
             }
+
         });
     }
 
index 2b3809ead0a98fb5120b03b8b8a897b256acb16c..184ecfb907b879eb2613c4bb8d27366940d54def 100644 (file)
@@ -10,7 +10,6 @@ package org.opendaylight.protocol.pcep.impl;
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufUtil;
-import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.ByteToMessageDecoder;
@@ -57,14 +56,11 @@ public final class PCEPByteToMessageDecoder extends ByteToMessageDecoder {
         if (!errors.isEmpty()) {
             // We have a bunch of messages, send them out
             for (final Object e : errors) {
-                ctx.channel().writeAndFlush(e).addListener(new ChannelFutureListener() {
-                    @Override
-                    public void operationComplete(final ChannelFuture f) {
-                        if (!f.isSuccess()) {
-                            LOG.warn("Failed to send message {} to socket {}", e, ctx.channel(), f.cause());
-                        } else {
-                            LOG.trace("Message {} sent to socket {}", e, ctx.channel());
-                        }
+                ctx.channel().writeAndFlush(e).addListener((ChannelFutureListener) f -> {
+                    if (!f.isSuccess()) {
+                        LOG.warn("Failed to send message {} to socket {}", e, ctx.channel(), f.cause());
+                    } else {
+                        LOG.trace("Message {} sent to socket {}", e, ctx.channel());
                     }
                 });
             }
index 80e823fc81bacb26b77cec0db13d7753a14ef963..5924e0a61ef962e43a0588c167e5997dfef168bb 100644 (file)
@@ -142,8 +142,8 @@ public class PCEPDispatcherImpl implements PCEPDispatcher, Closeable {
     @Override
     public final void close() {
         if (Epoll.isAvailable()) {
-            this.workerGroup.shutdownGracefully(0, TIMEOUT, TimeUnit.SECONDS);;
-            this.bossGroup.shutdownGracefully(0, TIMEOUT, TimeUnit.SECONDS);;
+            this.workerGroup.shutdownGracefully(0, TIMEOUT, TimeUnit.SECONDS);
+            this.bossGroup.shutdownGracefully(0, TIMEOUT, TimeUnit.SECONDS);
         }
     }
 
index dfb732b9dfad75b1e9b33a3ed691e74c442bad4f..73c82493c121ebd034d6f6d4a4ba6023eeb8c530 100644 (file)
@@ -14,7 +14,6 @@ import com.google.common.cache.CacheBuilder;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.concurrent.GuardedBy;
@@ -73,23 +72,13 @@ final class PCEPPeerRegistry {
     }
 
     protected synchronized Short nextSession(final byte[] clientAddress) throws ExecutionException {
-        final PeerRecord peer = this.formerClients.get(new ByteArrayWrapper(clientAddress), new Callable<PeerRecord>() {
-            @Override
-            public PeerRecord call() {
-                return new PeerRecord(ID_CACHE_SECONDS, null);
-            }
-        });
+        final PeerRecord peer = this.formerClients.get(new ByteArrayWrapper(clientAddress), () -> new PeerRecord(ID_CACHE_SECONDS, null));
 
         return peer.allocId();
     }
 
     protected synchronized void releaseSession(final byte[] clientAddress, final short sessionId) throws ExecutionException {
-        this.formerClients.get(new ByteArrayWrapper(clientAddress), new Callable<PeerRecord>() {
-            @Override
-            public PeerRecord call() {
-                return new PeerRecord(ID_CACHE_SECONDS, sessionId);
-            }
-        });
+        this.formerClients.get(new ByteArrayWrapper(clientAddress), () -> new PeerRecord(ID_CACHE_SECONDS, sessionId));
     }
 
     private static final class ByteArrayWrapper {
index f1daf29119e4337cffe001e79d47e7dae57cfa23..d8de880e076ab396a53f9af139e3285c2d44dfe5 100755 (executable)
@@ -111,14 +111,11 @@ public final class PCEPProtocolSessionPromise<S extends PCEPSession> extends Def
                     }
 
                     final EventLoop loop = cf.channel().eventLoop();
-                    loop.schedule(new Runnable() {
-                        @Override
-                        public void run() {
-                            PCEPProtocolSessionPromise.LOG.debug("Attempting to connect to {}", PCEPProtocolSessionPromise.this.address);
-                            final Future reconnectFuture = PCEPProtocolSessionPromise.this.b.connect();
-                            reconnectFuture.addListener(PCEPProtocolSessionPromise.BootstrapConnectListener.this);
-                            PCEPProtocolSessionPromise.this.pending = reconnectFuture;
-                        }
+                    loop.schedule(() -> {
+                        PCEPProtocolSessionPromise.LOG.debug("Attempting to connect to {}", PCEPProtocolSessionPromise.this.address);
+                        final Future reconnectFuture = PCEPProtocolSessionPromise.this.b.connect();
+                        reconnectFuture.addListener(BootstrapConnectListener.this);
+                        PCEPProtocolSessionPromise.this.pending = reconnectFuture;
                     }, PCEPProtocolSessionPromise.this.retryTimer, TimeUnit.SECONDS);
                     PCEPProtocolSessionPromise.LOG.debug("Next reconnection attempt in {}s", PCEPProtocolSessionPromise.this.retryTimer);
                 }
index 8c01919f59ba53f31f244e4ee989768098917d33..e8c8967cb3e73fc43dd1a6da8e8b1dc1c2b315d5 100644 (file)
@@ -10,7 +10,6 @@ package org.opendaylight.protocol.pcep.impl;
 import com.google.common.base.Optional;
 import com.google.common.primitives.UnsignedBytes;
 import io.netty.channel.Channel;
-import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
 import io.netty.util.concurrent.Promise;
 import java.net.InetSocketAddress;
@@ -94,12 +93,9 @@ public class PCEPSessionNegotiator extends AbstractSessionNegotiator {
                 }
             });
 
-            this.channel.closeFuture().addListener(new ChannelFutureListener() {
-                @Override
-                public void operationComplete(final ChannelFuture future) {
-                    synchronized (lock) {
-                        sessionReg.removeSessionReference(clientAddress);
-                    }
+            this.channel.closeFuture().addListener((ChannelFutureListener) future -> {
+                synchronized (lock) {
+                    sessionReg.removeSessionReference(clientAddress);
                 }
             });
 
index 53db1d1dabf1eb7d7e72f5c2f9af646c9c0634c5..4a56635b0a11264082de51265fc8b2880d8df086 100644 (file)
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.protocol.pcep.impl.spi;
 
-import java.util.Arrays;
+import java.util.Collections;
 import org.opendaylight.protocol.pcep.spi.PCEPErrors;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.message.rev131007.PcerrBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Message;
@@ -34,11 +34,11 @@ public final class Util {
         final ErrorObject err = new ErrorObjectBuilder().setType(e.getErrorType()).setValue(e.getErrorValue()).build();
         if (t == null) {
             return errMessageBuilder.setPcerrMessage(
-                    new PcerrMessageBuilder().setErrors(Arrays.asList(new ErrorsBuilder().setErrorObject(err).build())).build()).build();
+                    new PcerrMessageBuilder().setErrors(Collections.singletonList(new ErrorsBuilder().setErrorObject(err).build())).build()).build();
         } else {
             final ErrorType type = new SessionCaseBuilder().setSession(new SessionBuilder().setOpen(t).build()).build();
             return errMessageBuilder.setPcerrMessage(
-                    new PcerrMessageBuilder().setErrors(Arrays.asList(new ErrorsBuilder().setErrorObject(err).build())).setErrorType(type).build()).build();
+                    new PcerrMessageBuilder().setErrors(Collections.singletonList(new ErrorsBuilder().setErrorObject(err).build())).setErrorType(type).build()).build();
         }
     }
 }
index 7c9ee85a238895364f6224b4aaeffa320a0927f5..43411b290260a6289ef0f00a10a746eac8158b5d 100644 (file)
@@ -18,7 +18,7 @@ import org.slf4j.LoggerFactory;
 
 public class MockPCE implements PCEPSessionListener {
 
-    private final List<Message> listMsg = new ArrayList<Message>();
+    private final List<Message> listMsg = new ArrayList<>();
 
     private PCEPSessionImpl session = null;
 
index d1adcb58db371c8ab098a3a36bddcea9ff00a304..af3acd1759308328e8a3151b979150822b200f06 100644 (file)
@@ -48,6 +48,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.vs.tlv.vs.tlv.VendorPayload;
 import org.opendaylight.yangtools.yang.binding.DataContainer;
 
+@SuppressWarnings("ALL")
 public class PCEPTlvParserTest {
 
     private static final byte[] noPathVectorBytes = { 0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00, (byte) 0xa7 };
index 59d2bb8e5b87fe8b24beff7ed8d825a08b736b58..b177a11f505fdee7316022447b7e2199b617da0c 100755 (executable)
@@ -12,7 +12,6 @@ import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.LoggerContext;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
-import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.net.InetAddresses;
@@ -86,7 +85,7 @@ public final class Main {
             } else if (args[argIdx].equals("--password")) {
                 password = args[++argIdx];
             } else if (args[argIdx].equals("--reconnect")) {
-                reconnectTime = Integer.valueOf(args[++argIdx]).intValue();
+                reconnectTime = Integer.valueOf(args[++argIdx]);
             } else if (args[argIdx].equals("--redelegation-timeout")) {
                 redelegationTimeout = Integer.valueOf(args[++argIdx]);
             } else if (args[argIdx].equals("--state-timeout")) {
@@ -140,11 +139,6 @@ public final class Main {
     }
 
     private static ch.qos.logback.classic.Logger getRootLogger(final LoggerContext lc) {
-        return Iterables.find(lc.getLoggerList(), new Predicate<Logger>() {
-            @Override
-            public boolean apply(final Logger input) {
-                return (input != null) ? input.getName().equals(Logger.ROOT_LOGGER_NAME) : false;
-            }
-        });
+        return Iterables.find(lc.getLoggerList(), input -> (input != null) ? input.getName().equals(Logger.ROOT_LOGGER_NAME) : false);
     }
 }
index 17bf03393313ecd894c89957c8ae0f59dbc70000..a8280f14017e8ff6aca50ec533ac6dbfff12971e 100644 (file)
@@ -22,7 +22,6 @@ import com.google.common.base.Preconditions;
 import com.google.common.net.InetAddresses;
 import io.netty.util.Timeout;
 import io.netty.util.Timer;
-import io.netty.util.TimerTask;
 import java.math.BigInteger;
 import java.net.InetAddress;
 import java.util.Collections;
@@ -116,7 +115,7 @@ public final class PCCTunnelManagerImpl implements PCCTunnelManager {
             //check if session really has a delegation
             if (hasDelegation(tunnel, session)) {
                 //send report D=0
-                final Tlvs tlvs = buildTlvs(tunnel, plspId.getValue(), Optional.<List<Subobject>>absent());
+                final Tlvs tlvs = buildTlvs(tunnel, plspId.getValue(), Optional.absent());
                 final Pcrpt pcrtp = createPcRtpMessage(new LspBuilder(update.getLsp()).setSync(true).setOperational(OperationalStatus.Up).setDelegate(false).
                     setTlvs(tlvs).build(), Optional.of(createSrp(srpId)), tunnel.getLspState());
                 session.sendReport(pcrtp);
@@ -148,7 +147,7 @@ public final class PCCTunnelManagerImpl implements PCCTunnelManager {
                 tunnel.cancelTimeouts();
                 setDelegation(plspId, session);
                 //send report
-                final Tlvs tlvs = buildTlvs(tunnel, plspId.getValue(), Optional.<List<Subobject>>absent());
+                final Tlvs tlvs = buildTlvs(tunnel, plspId.getValue(), Optional.absent());
                 session.sendReport(createPcRtpMessage(
                     new LspBuilder(request.getLsp()).setSync(true).setOperational(OperationalStatus.Up).setDelegate(true).setTlvs(tlvs).build(),
                     Optional.of(createSrp(srpId)), tunnel.getLspState()));
@@ -321,7 +320,7 @@ public final class PCCTunnelManagerImpl implements PCCTunnelManager {
              missedLsp <= this.syncOptimization.getLocalLspDbVersionValue().longValue(); missedLsp++) {
             final PlspId plspId = new PlspId(missedLsp);
             final PCCTunnel tunnel = this.tunnels.get(plspId);
-            createLspAndSendReport(missedLsp, tunnel, session, Optional.<Boolean>absent(), NO_SRP);
+            createLspAndSendReport(missedLsp, tunnel, session, Optional.absent(), NO_SRP);
         }
     }
 
@@ -341,7 +340,7 @@ public final class PCCTunnelManagerImpl implements PCCTunnelManager {
     }
 
     private void sendEndOfSynchronization(final PCCSession session) {
-        sendEndOfSynchronization(session, Optional.<SrpIdNumber>absent());
+        sendEndOfSynchronization(session, Optional.absent());
     }
 
     private void sendEndOfSynchronization(final PCCSession session, final Optional<SrpIdNumber> operationId) {
@@ -354,12 +353,12 @@ public final class PCCTunnelManagerImpl implements PCCTunnelManager {
             tlv = createLspTlvsEndofSync(this.syncOptimization.incrementLspDBVersion().get());
         }
         final Pcrpt pcrtp = createPcRtpMessage(createLsp(0, false, tlv, true, false), Optional.fromNullable(srp), createPath(Collections
-            .<Subobject>emptyList()));
+            .emptyList()));
         session.sendReport(pcrtp);
     }
 
     private void reportAllKnownLsp(final PCCSession session) {
-        reportAllKnownLsp(Optional.<SrpIdNumber>absent(), session);
+        reportAllKnownLsp(Optional.absent(), session);
     }
 
     private void reportAllKnownLsp(final Optional<SrpIdNumber> operationId, final PCCSession session) {
@@ -371,7 +370,7 @@ public final class PCCTunnelManagerImpl implements PCCTunnelManager {
         for (final Entry<PlspId, PCCTunnel> entry : this.tunnels.entrySet()) {
             final PCCTunnel tunnel = entry.getValue();
             final long plspId = entry.getKey().getValue();
-            createLspAndSendReport(plspId, tunnel, session, Optional.<Boolean>absent(), Optional.fromNullable(srp));
+            createLspAndSendReport(plspId, tunnel, session, Optional.absent(), Optional.fromNullable(srp));
         }
     }
 
@@ -404,15 +403,12 @@ public final class PCCTunnelManagerImpl implements PCCTunnelManager {
 
     private void startStateTimeout(final PCCTunnel tunnel, final PlspId plspId) {
         if (this.stateTimeout > -1) {
-            final Timeout newStateTimeout = this.timer.newTimeout(new TimerTask() {
-                @Override
-                public void run(final Timeout timeout) throws Exception {
-                    if (tunnel.getType() == LspType.PCE_LSP) {
-                        PCCTunnelManagerImpl.this.tunnels.remove(plspId);
-                        //report tunnel removal to all
-                        sendToAll(tunnel, plspId, Collections.<Subobject>emptyList(), createSrp(0), new PathBuilder().build(),
-                            createLsp(plspId.getValue(), false, Optional.<Tlvs>absent(), false, true));
-                    }
+            final Timeout newStateTimeout = this.timer.newTimeout(timeout -> {
+                if (tunnel.getType() == LspType.PCE_LSP) {
+                    PCCTunnelManagerImpl.this.tunnels.remove(plspId);
+                    //report tunnel removal to all
+                    sendToAll(tunnel, plspId, Collections.emptyList(), createSrp(0), new PathBuilder().build(),
+                        createLsp(plspId.getValue(), false, Optional.absent(), false, true));
                 }
             }, this.stateTimeout, TimeUnit.SECONDS);
             tunnel.setStateTimeout(newStateTimeout);
@@ -420,29 +416,26 @@ public final class PCCTunnelManagerImpl implements PCCTunnelManager {
     }
 
     private void startRedelegationTimer(final PCCTunnel tunnel, final PlspId plspId, final PCCSession session) {
-        final Timeout newRedelegationTimeout = this.timer.newTimeout(new TimerTask() {
-            @Override
-            public void run(final Timeout timeout) throws Exception {
-                //remove delegation
-                PCCTunnelManagerImpl.this.setDelegation(plspId, null);
-                //delegate to another PCE
-                int index = session.getId();
-                for (int i = 1; i < PCCTunnelManagerImpl.this.sessions.size(); i++) {
-                    index++;
-                    if (index == PCCTunnelManagerImpl.this.sessions.size()) {
-                        index = 0;
-                    }
-                    final PCCSession nextSession = PCCTunnelManagerImpl.this.sessions.get(index);
-                    if (nextSession != null) {
-                        tunnel.cancelTimeouts();
-                        final Tlvs tlvs = buildTlvs(tunnel, plspId.getValue(), Optional.<List<Subobject>>absent());
-
-                        nextSession.sendReport(createPcRtpMessage(
-                            createLsp(plspId.getValue(), true, Optional.fromNullable(tlvs), true, false), NO_SRP,
-                            tunnel.getLspState()));
-                        tunnel.setDelegationHolder(nextSession.getId());
-                        break;
-                    }
+        final Timeout newRedelegationTimeout = this.timer.newTimeout(timeout -> {
+            //remove delegation
+            PCCTunnelManagerImpl.this.setDelegation(plspId, null);
+            //delegate to another PCE
+            int index = session.getId();
+            for (int i = 1; i < PCCTunnelManagerImpl.this.sessions.size(); i++) {
+                index++;
+                if (index == PCCTunnelManagerImpl.this.sessions.size()) {
+                    index = 0;
+                }
+                final PCCSession nextSession = PCCTunnelManagerImpl.this.sessions.get(index);
+                if (nextSession != null) {
+                    tunnel.cancelTimeouts();
+                    final Tlvs tlvs = buildTlvs(tunnel, plspId.getValue(), Optional.absent());
+
+                    nextSession.sendReport(createPcRtpMessage(
+                        createLsp(plspId.getValue(), true, Optional.fromNullable(tlvs), true, false), NO_SRP,
+                        tunnel.getLspState()));
+                    tunnel.setDelegationHolder(nextSession.getId());
+                    break;
                 }
             }
         }, this.redelegationTimeout, TimeUnit.SECONDS);
index db5bf7cb5c8447f22daa062ecf021475fb1caaa6..11d92b9c41fab4720d6531b3206197eef07f4c6e 100644 (file)
@@ -9,5 +9,5 @@
 package org.opendaylight.protocol.pcep.pcc.mock.api;
 
 public enum LspType {
-    PCE_LSP, PCC_LSP;
+    PCE_LSP, PCC_LSP
 }
index bd75bee7c1628bf7a8e16ab94f2cf6a5afbc513a..d8a9d62190b088420ba47e5f27eae022c8c7f04b 100644 (file)
@@ -33,7 +33,7 @@ public final class PCCPeerProposal implements PCEPPeerProposal {
     @Override
     public void setPeerSpecificProposal(@Nonnull final InetSocketAddress address, @Nonnull final TlvsBuilder openBuilder) {
         Preconditions.checkNotNull(address);
-        final LspDbVersion LspDBV = new LspDbVersionBuilder().setLspDbVersionValue(this.dbVersion).build();
-        openBuilder.addAugmentation(Tlvs3.class, new Tlvs3Builder().setLspDbVersion(LspDBV).build());
+        final LspDbVersion lspDbVersion = new LspDbVersionBuilder().setLspDbVersionValue(this.dbVersion).build();
+        openBuilder.addAugmentation(Tlvs3.class, new Tlvs3Builder().setLspDbVersion(lspDbVersion).build());
     }
 }
index 1187ed9fe486de98769c8d107a77a55a465efc79..c75f75bf354e403f55d328a9d3a44711f55a2efd 100644 (file)
@@ -12,7 +12,7 @@ import com.google.common.base.Optional;
 import com.google.common.collect.Lists;
 import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import javax.annotation.Nonnull;
 import org.opendaylight.protocol.pcep.spi.PCEPErrors;
@@ -124,7 +124,7 @@ public final class MsgBuilderUtil {
 
     public static Tlvs createLspTlvs(final long lspId, final boolean symbolicPathName, final String tunnelEndpoint,
                                      final String tunnelSender, final String extendedTunnelAddress, final Optional<byte[]> symbolicName) {
-        return createLspTlvs(lspId, symbolicPathName, tunnelEndpoint, tunnelSender, extendedTunnelAddress, symbolicName, Optional.<BigInteger>absent());
+        return createLspTlvs(lspId, symbolicPathName, tunnelEndpoint, tunnelSender, extendedTunnelAddress, symbolicName, Optional.absent());
     }
 
     public static Tlvs createLspTlvs(final long lspId, final boolean symbolicPathName, final String tunnelEndpoint,
@@ -165,18 +165,18 @@ public final class MsgBuilderUtil {
     public static Pcerr createErrorMsg(@Nonnull final PCEPErrors e, @Nonnull final long srpId) {
         final PcerrMessageBuilder msgBuilder = new PcerrMessageBuilder();
         return new PcerrBuilder().setPcerrMessage(
-                msgBuilder
-                        .setErrorType(
-                                new StatefulCaseBuilder().setStateful(
-                                        new StatefulBuilder().setSrps(
-                                                Lists.newArrayList(new SrpsBuilder().setSrp(
-                                                        new SrpBuilder().setProcessingRule(false).setIgnore(false)
-                                                                .setOperationId(new SrpIdNumber(srpId)).build())
-                                                        .build())).build()).build())
-                        .setErrors(
-                                Arrays.asList(new ErrorsBuilder().setErrorObject(
-                                        new ErrorObjectBuilder().setType(e.getErrorType()).setValue(e.getErrorValue())
-                                                .build()).build())).build()).build();
+            msgBuilder
+                .setErrorType(
+                    new StatefulCaseBuilder().setStateful(
+                        new StatefulBuilder().setSrps(
+                            Lists.newArrayList(new SrpsBuilder().setSrp(
+                                new SrpBuilder().setProcessingRule(false).setIgnore(false)
+                                    .setOperationId(new SrpIdNumber(srpId)).build())
+                                .build())).build()).build())
+                .setErrors(
+                    Collections.singletonList(new ErrorsBuilder().setErrorObject(
+                        new ErrorObjectBuilder().setType(e.getErrorType()).setValue(e.getErrorValue())
+                            .build()).build())).build()).build();
     }
 
     public static byte[] getDefaultPathName(final String address, final long lspId) {
index 603be76f74995f10df801c436c425745b5592b9b..34e57f0d4d25a35434ff891ea71222917f69adce 100644 (file)
@@ -190,9 +190,9 @@ public abstract class PCCMockCommon {
             for (final Reports report : pcrt) {
                 final Lsp lsp = report.getLsp();
                 if (lsp.getPlspId().getValue() == 0) {
-                    assertEquals(false, lsp.isSync().booleanValue());
+                    assertEquals(false, lsp.isSync());
                 } else {
-                    assertEquals(true, lsp.isSync().booleanValue());
+                    assertEquals(true, lsp.isSync());
                 }
                 final BigInteger actuaLspDBVersion = lsp.getTlvs().getAugmentation(org.opendaylight.yang.gen
                     .v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs1.class)
index aa960dad85cc7b917bdd8305a71ab9ad9f73267c..f059f769ad085e3f0167921b05a9aa78cebdadfe 100644 (file)
@@ -25,8 +25,6 @@ import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 import org.opendaylight.protocol.pcep.pcc.mock.api.PCCSession;
 import org.opendaylight.protocol.pcep.pcc.mock.api.PCCTunnelManager;
 import org.opendaylight.protocol.pcep.spi.PCEPErrors;
@@ -76,21 +74,15 @@ public class PCCTunnelManagerImplTest {
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         Mockito.doNothing().when(this.session1).sendReport(Mockito.any(Pcrpt.class));
-        Mockito.doAnswer(new Answer<Void>() {
-            @Override
-            public Void answer(final InvocationOnMock invocation) throws Throwable {
-                PCCTunnelManagerImplTest.this.errorsSession1.add(getError((Pcerr) invocation.getArguments()[0]));
-                return null;
-            }
+        Mockito.doAnswer(invocation -> {
+            PCCTunnelManagerImplTest.this.errorsSession1.add(getError((Pcerr) invocation.getArguments()[0]));
+            return null;
         }).when(this.session1).sendError(Mockito.any(Pcerr.class));
         Mockito.doReturn(0).when(this.session1).getId();
         Mockito.doNothing().when(this.session2).sendReport(Mockito.any(Pcrpt.class));
-        Mockito.doAnswer(new Answer<Void>() {
-            @Override
-            public Void answer(final InvocationOnMock invocation) throws Throwable {
-                PCCTunnelManagerImplTest.this.errorsSession2.add(getError((Pcerr) invocation.getArguments()[0]));
-                return null;
-            }
+        Mockito.doAnswer(invocation -> {
+            PCCTunnelManagerImplTest.this.errorsSession2.add(getError((Pcerr) invocation.getArguments()[0]));
+            return null;
         }).when(this.session2).sendError(Mockito.any(Pcerr.class));
         Mockito.doReturn(1).when(this.session2).getId();
     }
index ba0cc4e6bed9fdf042efc482292849521f1ccad0..16e6ad5b8d37db42204d25a6d9163c9aa2cd997d 100644 (file)
@@ -12,7 +12,6 @@ import com.google.common.base.Preconditions;
 import com.google.common.primitives.UnsignedBytes;
 import io.netty.buffer.ByteBuf;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import javax.annotation.Nullable;
@@ -114,9 +113,9 @@ public abstract class AbstractMessageParser implements MessageParser, MessageSer
                     rp.get()).build())).build()).build();
         }
         return new PcerrBuilder().setPcerrMessage(
-                msgBuilder.setErrors(Arrays.asList(new ErrorsBuilder().setErrorObject(
-                        new ErrorObjectBuilder().setType(e.getErrorType()).setValue(
-                                e.getErrorValue()).build()).build())).build()).build();
+                msgBuilder.setErrors(Collections.singletonList(new ErrorsBuilder().setErrorObject(
+                    new ErrorObjectBuilder().setType(e.getErrorType()).setValue(
+                        e.getErrorValue()).build()).build())).build()).build();
     }
 
     protected abstract Message validate(final List<Object> objects, final List<Message> errors) throws PCEPDeserializerException;
index d5ffe2ed3d64b236612ad16ad35b34ee2a060b47..1769c26cb7f1489d12719cdabafe339edae12f7f 100644 (file)
@@ -21,7 +21,7 @@ public final class PSTUtil {
      * @return  true if setup is via RSVP-TE signaling protocol
      */
     public static boolean isDefaultPST(final PathSetupType pst) {
-        if (pst != null && pst.getPst() != null && pst.getPst().shortValue() != 0) {
+        if (pst != null && pst.getPst() != null && pst.getPst() != 0) {
             return false;
         }
         return true;
index 61db86914d155e0552d7dffa0992d6b0da674b6a..de9de6f6e3b248d4a87842df27b5369c2180aaae 100644 (file)
@@ -8,7 +8,7 @@
 package org.opendaylight.protocol.pcep.spi;
 
 import com.google.common.base.Preconditions;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Object;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.pcep.error.object.ErrorObjectBuilder;
@@ -39,7 +39,7 @@ public final class UnknownObject implements Object {
     }
 
     public List<Errors> getErrors() {
-        return Arrays.asList(this.error);
+        return Collections.singletonList(this.error);
     }
 
     public PCEPErrors getError() {
index 44fd412cfdfb4a9fb58272efb4b6cc45c9fd9ff3..9a3be81bfac1ed3e20d9406d4032255b5bde06f5 100644 (file)
@@ -90,7 +90,7 @@ public class AbstractMessageParserTest {
 
         Mockito.verify(this.registry, Mockito.only()).serializeObject(Mockito.any(Object.class), Mockito.any(ByteBuf.class));
 
-        final Message b = a.parseMessage(Unpooled.wrappedBuffer(new byte[] {0x0D, 0x13, 0, 0x08, 0, 0, 1, 1 }), Collections.<Message> emptyList());
+        final Message b = a.parseMessage(Unpooled.wrappedBuffer(new byte[] {0x0D, 0x13, 0, 0x08, 0, 0, 1, 1 }), Collections.emptyList());
 
         assertEquals(this.object, ((Pcerr) b).getPcerrMessage().getErrors().get(0).getErrorObject());
     }
@@ -103,7 +103,7 @@ public class AbstractMessageParserTest {
         parser.serializeVendorInformationObjects(Lists.newArrayList(this.viObject), buffer);
         Mockito.verify(this.registry, Mockito.only()).serializeVendorInformationObject(Mockito.any(VendorInformationObject.class), Mockito.any(ByteBuf.class));
 
-        final Message msg = parser.parseMessage(Unpooled.wrappedBuffer(new byte[] {0x22, 0x13, 0x00, 0x08, 0, 0, 0, 0 }), Collections.<Message> emptyList());
+        final Message msg = parser.parseMessage(Unpooled.wrappedBuffer(new byte[] {0x22, 0x13, 0x00, 0x08, 0, 0, 0, 0 }), Collections.emptyList());
 
         assertEquals(this.viObject, ((Pcrep)msg).getPcrepMessage().getReplies().get(0).getVendorInformationObject().get(0));
     }
index e312b4ef818d36c21fb27d8de66a9e00a14fb9e0..972a8d7ce5648c1e63a8b2f83318e21f541519cd 100644 (file)
@@ -68,7 +68,7 @@ public class AbstractObjectWithTlvsTest {
         protected void addVendorInformationTlvs(TlvsBuilder builder, List<VendorInformationTlv> tlvs) {
             builder.setVendorInformationTlv(tlvs);
         }
-    };
+    }
 
     @Before
     public void setUp() throws PCEPDeserializerException {
index 253b22c69e18bd40105144c1d1608ea5b9a7f223..2e7951f4c547462df2f308449a58fab376fde397 100644 (file)
@@ -183,7 +183,7 @@ public class RegistryTest {
         this.ctx.getObjectHandlerRegistry().parseObject(4, 1, new ObjectHeaderImpl(true, false), buffer);
         this.ctx.getObjectHandlerRegistry().serializeObject(new OpenBuilder().build(), buffer);
 
-        this.ctx.getMessageHandlerRegistry().parseMessage(6, buffer, Collections.<Message> emptyList());
+        this.ctx.getMessageHandlerRegistry().parseMessage(6, buffer, Collections.emptyList());
         this.ctx.getMessageHandlerRegistry().serializeMessage(new KeepaliveBuilder().build(), buffer);
 
         this.ctx.getVendorInformationObjectRegistry().parseVendorInformationObject(new EnterpriseNumber(10L), new ObjectHeaderImpl(true, false), buffer);
index 50bd8c09f1456ac442dea2697356d468e6082e8e..211c7bb07318aac016c441e696970cadbd27d482 100644 (file)
@@ -14,8 +14,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import org.opendaylight.protocol.pcep.PCEPCapability;
-import org.opendaylight.protocol.pcep.PCEPSessionListener;
-import org.opendaylight.protocol.pcep.PCEPSessionListenerFactory;
 import org.opendaylight.protocol.pcep.PCEPSessionNegotiatorFactory;
 import org.opendaylight.protocol.pcep.PCEPSessionProposalFactory;
 import org.opendaylight.protocol.pcep.impl.BasePCEPSessionProposalFactory;
@@ -37,12 +35,7 @@ public class PCCMock {
         final InetSocketAddress clientAddr = InetSocketAddressUtil.getRandomLoopbackInetSocketAddress(0);
 
         try (final PCCDispatcherImpl pccDispatcher = new PCCDispatcherImpl(ServiceLoaderPCEPExtensionProviderContext.getSingletonInstance().getMessageHandlerRegistry())) {
-            pccDispatcher.createClient(serverAddr, -1, new PCEPSessionListenerFactory() {
-                @Override
-                public PCEPSessionListener getSessionListener() {
-                    return new SimpleSessionListener();
-                }
-            }, snf, null, clientAddr).get();
+            pccDispatcher.createClient(serverAddr, -1, SimpleSessionListener::new, snf, null, clientAddr).get();
         }
     }
 }
index 94c85ed04b25884d76c0ce0493bba4b44d3c6956..b44bdf77489f6a72c047001ce4c3bb10f6347799 100755 (executable)
@@ -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 short rpcTimeout = serverSessionManager.getRpcTimeout();
+        final short rpcTimeout = this.serverSessionManager.getRpcTimeout();
         LOG.trace("RPC response timeout value is {} seconds", rpcTimeout);
         if (rpcTimeout > 0) {
             setupTimeoutHandler(requestId, req, rpcTimeout);
index fc424dfddc45b36551278eda6098ca39b78a7db7..66f69f8a2e8408943ea6dd29aa9511a8eb555200 100644 (file)
@@ -31,12 +31,7 @@ final class OperationResults implements OperationResult {
     static final OperationResults SUCCESS = new OperationResults((FailureType)null);
     static final OperationResults UNSENT = new OperationResults(FailureType.Unsent);
 
-    private static final Function<Errors, Error> CONVERT_ERRORS = new Function<Errors, Error>() {
-        @Override
-        public Error apply(final Errors input) {
-            return new ErrorBuilder(input).build();
-        }
-    };
+    private static final Function<Errors, Error> CONVERT_ERRORS = input -> new ErrorBuilder(input).build();
 
     private final FailureType failure;
     private final List<Error> error;
@@ -52,16 +47,16 @@ final class OperationResults implements OperationResult {
     }
 
     ListenableFuture<OperationResult> future() {
-        return Futures.<OperationResult> immediateFuture(this);
+        return Futures.immediateFuture(this);
     }
 
     public static OperationResults createFailed(final List<Errors> errors) {
-        final List<Errors> e = errors != null ? errors : Collections.<Errors>emptyList();
+        final List<Errors> e = errors != null ? errors : Collections.emptyList();
         return new OperationResults(FailureType.Failed, Lists.transform(e, CONVERT_ERRORS));
     }
 
     public static OperationResults createUnsent(final PCEPErrors error) {
-        final List<Errors> e = error != null ? Collections.singletonList(getErrorFor(error)) : Collections.<Errors>emptyList();
+        final List<Errors> e = error != null ? Collections.singletonList(getErrorFor(error)) : Collections.emptyList();
         return new OperationResults(FailureType.Unsent, Lists.transform(e, CONVERT_ERRORS));
     }
 
index 2dd33d1712c901e170169474b8444dd43c46d4d1..7ce02e810086d07a2099c4b69557a7c837550bfa 100644 (file)
@@ -115,7 +115,7 @@ class Stateful07TopologySessionListener extends AbstractTopologySessionListener<
             final Stateful stateful = tlvs.getAugmentation(Tlvs1.class).getStateful();
             if (stateful != null) {
                 getSessionListenerState().setPeerCapabilities(getCapabilities(stateful));
-                pccBuilder.setReportedLsp(Collections.<ReportedLsp> emptyList());
+                pccBuilder.setReportedLsp(Collections.emptyList());
                 if (isSynchronized()) {
                     pccBuilder.setStateSync(PccSyncState.Synchronized);
                 } else if (isTriggeredInitialSynchro()) {
@@ -514,18 +514,15 @@ class Stateful07TopologySessionListener extends AbstractTopologySessionListener<
         if (f == null) {
             return OperationResults.createUnsent(PCEPErrors.LSP_INTERNAL_ERROR).future();
         }
-        return Futures.transform(f, new AsyncFunction<Optional<ReportedLsp>, OperationResult>() {
-            @Override
-            public ListenableFuture<OperationResult> apply(final Optional<ReportedLsp> rep) {
-                final Lsp reportedLsp = validateReportedLsp(rep, input);
-                if (reportedLsp == null) {
-                    return OperationResults.createUnsent(PCEPErrors.UNKNOWN_PLSP_ID).future();
-                }
-                final PcinitiateMessageBuilder ib = new PcinitiateMessageBuilder(MESSAGE_HEADER);
-                final Requests rb = buildRequest(rep, reportedLsp);
-                ib.setRequests(Collections.singletonList(rb));
-                return sendMessage(new PcinitiateBuilder().setPcinitiateMessage(ib.build()).build(), rb.getSrp().getOperationId(), null);
+        return Futures.transform(f, (AsyncFunction<Optional<ReportedLsp>, OperationResult>) rep -> {
+            final Lsp reportedLsp = validateReportedLsp(rep, input);
+            if (reportedLsp == null) {
+                return OperationResults.createUnsent(PCEPErrors.UNKNOWN_PLSP_ID).future();
             }
+            final PcinitiateMessageBuilder ib = new PcinitiateMessageBuilder(MESSAGE_HEADER);
+            final Requests rb = buildRequest(rep, reportedLsp);
+            ib.setRequests(Collections.singletonList(rb));
+            return sendMessage(new PcinitiateBuilder().setPcinitiateMessage(ib.build()).build(), rb.getSrp().getOperationId(), null);
         });
     }
 
@@ -659,26 +656,23 @@ class Stateful07TopologySessionListener extends AbstractTopologySessionListener<
     }
 
     private ListenableFuture<OperationResult> listenableFuture(final ListenableFuture<Optional<ReportedLsp>> f, final EnsureLspOperationalInput input, final OperationalStatus op) {
-        return Futures.transform(f, new Function<Optional<ReportedLsp>, OperationResult>() {
-            @Override
-            public OperationResult apply(final Optional<ReportedLsp> rep) {
-                if (!rep.isPresent()) {
-                    LOG.debug("Node {} does not contain LSP {}", input.getNode(), input.getName());
+        return Futures.transform(f, (Function<Optional<ReportedLsp>, OperationResult>) rep -> {
+            if (!rep.isPresent()) {
+                LOG.debug("Node {} does not contain LSP {}", input.getNode(), input.getName());
+                return OperationResults.UNSENT;
+            }
+            // check if at least one of the paths has the same status as requested
+            for (final Path p : rep.get().getPath()) {
+                final Path1 p1 = p.getAugmentation(Path1.class);
+                if (p1 == null) {
+                    LOG.warn("Node {} LSP {} does not contain data", input.getNode(), input.getName());
                     return OperationResults.UNSENT;
                 }
-                // check if at least one of the paths has the same status as requested
-                for (final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.pcep.client.attributes.path.computation.client.reported.lsp.Path p : rep.get().getPath()) {
-                    final Path1 p1 = p.getAugmentation(Path1.class);
-                    if (p1 == null) {
-                        LOG.warn("Node {} LSP {} does not contain data", input.getNode(), input.getName());
-                        return OperationResults.UNSENT;
-                    }
-                    if (op.equals(p1.getLsp().getOperational())) {
-                        return OperationResults.SUCCESS;
-                    }
+                if (op.equals(p1.getLsp().getOperational())) {
+                    return OperationResults.SUCCESS;
                 }
-                return OperationResults.UNSENT;
             }
+            return OperationResults.UNSENT;
         });
     }
 
index 1bbbe365e891881b7f6b7cf3194dfc7475d439ab..03f67c3dac7e0e2ba1751808675a2bc21a2592f7 100644 (file)
@@ -40,52 +40,27 @@ final class TopologyRPCs implements NetworkTopologyPcepService {
 
     @Override
     public Future<RpcResult<AddLspOutput>> addLsp(final AddLspInput input) {
-        return Futures.transform(manager.addLsp(input), new Function<OperationResult, RpcResult<AddLspOutput>>() {
-            @Override
-            public RpcResult<AddLspOutput> apply(final OperationResult input) {
-                return SuccessfulRpcResult.create(new AddLspOutputBuilder(input).build());
-            }
-        });
+        return Futures.transform(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), new Function<OperationResult, RpcResult<RemoveLspOutput>>() {
-            @Override
-            public RpcResult<RemoveLspOutput> apply(final OperationResult input) {
-                return SuccessfulRpcResult.create(new RemoveLspOutputBuilder(input).build());
-            }
-        });
+        return Futures.transform(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), new Function<OperationResult, RpcResult<TriggerSyncOutput>>() {
-            @Override
-            public RpcResult<TriggerSyncOutput> apply(final OperationResult input) {
-                return SuccessfulRpcResult.create(new TriggerSyncOutputBuilder(input).build());
-            }
-        });
+        return Futures.transform(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), new Function<OperationResult, RpcResult<UpdateLspOutput>>() {
-            @Override
-            public RpcResult<UpdateLspOutput> apply(final OperationResult input) {
-                return SuccessfulRpcResult.create(new UpdateLspOutputBuilder(input).build());
-            }
-        });
+        return Futures.transform(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),
-                new Function<OperationResult, RpcResult<EnsureLspOperationalOutput>>() {
-                    @Override
-                    public RpcResult<EnsureLspOperationalOutput> apply(final OperationResult input) {
-                        return SuccessfulRpcResult.create(new EnsureLspOperationalOutputBuilder(input).build());
-                    }
-                });
+            (Function<OperationResult, RpcResult<EnsureLspOperationalOutput>>) input1 -> SuccessfulRpcResult.create(new EnsureLspOperationalOutputBuilder(input1).build()));
     }
 }
index d25301fc9aab05dbbc61ffa8282c2b1eff341d85..1ba365350ca5255277ed590eae6fdd6930738721 100644 (file)
@@ -107,12 +107,7 @@ final class CreateTunnelInstructionExecutor extends AbstractInstructionExecutor
 
             return Futures.transform(
                 (ListenableFuture<RpcResult<AddLspOutput>>) this.topologyService.addLsp(addLspInput),
-                new Function<RpcResult<AddLspOutput>, OperationResult>() {
-                    @Override
-                    public OperationResult apply(final RpcResult<AddLspOutput> input) {
-                        return input.getResult();
-                    }
-                });
+                (Function<RpcResult<AddLspOutput>, OperationResult>) RpcResult::getResult);
         }
     }
 
@@ -201,7 +196,7 @@ final class CreateTunnelInstructionExecutor extends AbstractInstructionExecutor
             if (sc.getIpv4Address() != null) {
                 for (final IpAddress dc : dsts) {
                     if (dc.getIpv4Address() != null) {
-                        return Optional.<AddressFamily>of(new Ipv4CaseBuilder().setIpv4(new Ipv4Builder().setSourceIpv4Address(sc.getIpv4Address()).
+                        return Optional.of(new Ipv4CaseBuilder().setIpv4(new Ipv4Builder().setSourceIpv4Address(sc.getIpv4Address()).
                             setDestinationIpv4Address(dc.getIpv4Address()).build()).build());
                     }
                 }
@@ -216,7 +211,7 @@ final class CreateTunnelInstructionExecutor extends AbstractInstructionExecutor
             if (sc.getIpv6Address() != null) {
                 for (final IpAddress dc : dsts) {
                     if (dc.getIpv6Address() != null) {
-                        return Optional.<AddressFamily>of(new Ipv6CaseBuilder().setIpv6(new Ipv6Builder().setSourceIpv6Address(sc.getIpv6Address()).
+                        return Optional.of(new Ipv6CaseBuilder().setIpv6(new Ipv6Builder().setSourceIpv6Address(sc.getIpv6Address()).
                             setDestinationIpv6Address(dc.getIpv6Address()).build()).build());
                     }
                 }
index 8c67f65acdd529a0a5e3d38893e721e675696ad3..d906dce77d627f84c25c16364707788592d04972 100644 (file)
@@ -67,12 +67,7 @@ final class DestroyTunnelInstructionExecutor extends AbstractInstructionExecutor
             ab.setNode(node.getSupportingNode().get(0).getKey().getNodeRef());
             return Futures.transform(
                 (ListenableFuture<RpcResult<RemoveLspOutput>>) this.topologyService.removeLsp(ab.build()),
-                new Function<RpcResult<RemoveLspOutput>, OperationResult>() {
-                    @Override
-                    public OperationResult apply(final RpcResult<RemoveLspOutput> input) {
-                        return input.getResult();
-                    }
-                });
+                (Function<RpcResult<RemoveLspOutput>, OperationResult>) RpcResult::getResult);
         }
     }
 }
index bef4b709ef3e913512d923e88bb5970f7341f98e..b9acd8ad1fbafd3c7cd3063d87b1429942d6b816 100644 (file)
@@ -38,7 +38,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 final class TunelProgrammingUtil {
-    public static final ListenableFuture<OperationResult> RESULT = Futures.<OperationResult>immediateFuture(new OperationResult() {
+    public static final ListenableFuture<OperationResult> RESULT = Futures.immediateFuture(new OperationResult() {
         @Override
         public Class<? extends DataContainer> getImplementedInterface() {
             return OperationResult.class;
index e7fba2bc7e9305bdfe72771f8f24195a89173db0..7e9ff4298ed15f06ac7a7a625afc59cdaaeeaad0 100644 (file)
@@ -74,12 +74,7 @@ final class UpdateTunnelInstructionExecutor extends AbstractInstructionExecutor
             }
             return Futures.transform(
                 (ListenableFuture<RpcResult<UpdateLspOutput>>) this.topologyService.updateLsp(buildUpdateInput(link, node)),
-                new Function<RpcResult<UpdateLspOutput>, OperationResult>() {
-                    @Override
-                    public OperationResult apply(final RpcResult<UpdateLspOutput> input) {
-                        return input.getResult();
-                    }
-                });
+                (Function<RpcResult<UpdateLspOutput>, OperationResult>) RpcResult::getResult);
         }
     }
 
index 26b4b77daa7a1c55684f2c17d437e6f50c27e5a0..167d1880fd386c3e14e7201f345e8c3b057b5a4d 100644 (file)
@@ -13,15 +13,12 @@ import com.google.common.util.concurrent.ListenableFuture;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
-import java.util.concurrent.Future;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 import org.opendaylight.bgpcep.programming.spi.Instruction;
 import org.opendaylight.bgpcep.programming.spi.InstructionScheduler;
 import org.opendaylight.bgpcep.programming.spi.SchedulerException;
@@ -97,6 +94,7 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 
+@SuppressWarnings("ALL")
 public class TunnelProgrammingTest extends AbstractDataBrokerTest {
 
     private static final TopologyId TOPOLOGY_ID = new TopologyId("tunnel-topo");
@@ -142,64 +140,43 @@ public class TunnelProgrammingTest extends AbstractDataBrokerTest {
         MockitoAnnotations.initMocks(this);
         Mockito.doReturn(true).when(this.instruction).checkedExecutionStart();
         Mockito.doNothing().when(this.instruction).executionCompleted(InstructionStatus.Failed, null);
-        Mockito.doAnswer(new Answer<Void>() {
-            @Override
-            public Void answer(final InvocationOnMock invocation) throws Throwable {
-                final Runnable callback = (Runnable) invocation.getArguments()[0];
-                callback.run();
-                return null;
-            }
+        Mockito.doAnswer(invocation -> {
+            final Runnable callback = (Runnable) invocation.getArguments()[0];
+            callback.run();
+            return null;
         }).when(this.instructionFuture).addListener(Mockito.any(Runnable.class), Mockito.any(Executor.class));
-        Mockito.doAnswer(new Answer<Void>() {
-            @Override
-            public Void answer(final InvocationOnMock invocation) throws Throwable {
-                final Runnable callback = (Runnable) invocation.getArguments()[0];
-                callback.run();
-                return null;
-            }
+        Mockito.doAnswer(invocation -> {
+            final Runnable callback = (Runnable) invocation.getArguments()[0];
+            callback.run();
+            return null;
         }).when(this.futureAddLspOutput).addListener(Mockito.any(Runnable.class), Mockito.any(Executor.class));
-        Mockito.doAnswer(new Answer<Void>() {
-            @Override
-            public Void answer(final InvocationOnMock invocation) throws Throwable {
-                final Runnable callback = (Runnable) invocation.getArguments()[0];
-                callback.run();
-                return null;
-            }
+        Mockito.doAnswer(invocation -> {
+            final Runnable callback = (Runnable) invocation.getArguments()[0];
+            callback.run();
+            return null;
         }).when(this.futureUpdateLspOutput).addListener(Mockito.any(Runnable.class), Mockito.any(Executor.class));
-        Mockito.doAnswer(new Answer<Void>() {
-            @Override
-            public Void answer(final InvocationOnMock invocation) throws Throwable {
-                final Runnable callback = (Runnable) invocation.getArguments()[0];
-                callback.run();
-                return null;
-            }
+        Mockito.doAnswer(invocation -> {
+            final Runnable callback = (Runnable) invocation.getArguments()[0];
+            callback.run();
+            return null;
         }).when(this.futureRemoveLspOutput).addListener(Mockito.any(Runnable.class), Mockito.any(Executor.class));
-        Mockito.doAnswer(new Answer<Future<RpcResult<AddLspOutput>>>() {
-            @Override
-            public Future<RpcResult<AddLspOutput>> answer(final InvocationOnMock invocation) throws Throwable {
-                TunnelProgrammingTest.this.addLspInput = (AddLspInput) invocation.getArguments()[0];
-                return TunnelProgrammingTest.this.futureAddLspOutput;
-            }
+        Mockito.doAnswer(invocation -> {
+            TunnelProgrammingTest.this.addLspInput = (AddLspInput) invocation.getArguments()[0];
+            return TunnelProgrammingTest.this.futureAddLspOutput;
         }).when(this.topologyService).addLsp(Mockito.any(AddLspInput.class));
-        Mockito.doAnswer(new Answer<Future<RpcResult<UpdateLspOutput>>>() {
-            @Override
-            public Future<RpcResult<UpdateLspOutput>> answer(final InvocationOnMock invocation) throws Throwable {
-                TunnelProgrammingTest.this.updateLspInput = (UpdateLspInput) invocation.getArguments()[0];
-                return TunnelProgrammingTest.this.futureUpdateLspOutput;
-            }
+        Mockito.doAnswer(invocation -> {
+            TunnelProgrammingTest.this.updateLspInput = (UpdateLspInput) invocation.getArguments()[0];
+            return TunnelProgrammingTest.this.futureUpdateLspOutput;
         }).when(this.topologyService).updateLsp(Mockito.any(UpdateLspInput.class));
-        Mockito.doAnswer(new Answer<Future<RpcResult<RemoveLspOutput>>>() {
-            @Override
-            public Future<RpcResult<RemoveLspOutput>> answer(final InvocationOnMock invocation) throws Throwable {
-                TunnelProgrammingTest.this.removeLspInput = (RemoveLspInput) invocation.getArguments()[0];
-                return TunnelProgrammingTest.this.futureRemoveLspOutput;
-            }
+        Mockito.doAnswer(invocation -> {
+            TunnelProgrammingTest.this.removeLspInput = (RemoveLspInput) invocation.getArguments()[0];
+            return TunnelProgrammingTest.this.futureRemoveLspOutput;
         }).when(this.topologyService).removeLsp(Mockito.any(RemoveLspInput.class));
-        Mockito.doReturn(instruction).when(this.instructionFuture).get();
+        Mockito.doReturn(this.instruction).when(this.instructionFuture).get();
         Mockito.doReturn(this.instructionFuture).when(this.scheduler).scheduleInstruction(Mockito.any(SubmitInstructionInput.class));
 
         createInitialTopology();
-        this.tunnelProgramming = new TunnelProgramming(scheduler, getDataBroker(), topologyService);
+        this.tunnelProgramming = new TunnelProgramming(this.scheduler, getDataBroker(), this.topologyService);
     }
 
     @Test
@@ -216,7 +193,7 @@ public class TunnelProgrammingTest extends AbstractDataBrokerTest {
         createInputBuilder.setBandwidth(bwd);
         createInputBuilder.setClassType(classType);
         createInputBuilder.setSymbolicPathName(tunnelName);
-        createInputBuilder.setExplicitHops(Lists.<ExplicitHops>newArrayList());
+        createInputBuilder.setExplicitHops(Lists.newArrayList());
         createInputBuilder.addAugmentation(PcepCreateP2pTunnelInput1.class, new PcepCreateP2pTunnelInput1Builder().setAdministrativeStatus(AdministrativeStatus.Active).build());
         this.tunnelProgramming.pcepCreateP2pTunnel(createInputBuilder.build());
         //check add-lsp input
index c8767df248569e840de597a56467f8ee9ecac761..34cf490e7c534681edbb95177997fafc5fda5b8c 100644 (file)
@@ -54,7 +54,7 @@ public class SimpleRSVPExtensionProviderContext extends SimpleRSVPExtensionConsu
 
     public SimpleRSVPExtensionProviderContext(final int maximumCachedObjects) {
         final Cache<Object, Object> cache = CacheBuilder.newBuilder().maximumSize(maximumCachedObjects).build();
-        this.cacheRef = new AtomicReference<Cache<Object,Object>>(cache);
+        this.cacheRef = new AtomicReference<>(cache);
     }
 
     @Override
index 5cd68a060516cba1a0dc3b4fbeb6a7c8ad0d8121..bd9afc90c9659493c10c9c5d81d9674abca4398c 100644 (file)
@@ -19,8 +19,6 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 import org.opendaylight.protocol.rsvp.parser.spi.EROSubobjectParser;
 import org.opendaylight.protocol.rsvp.parser.spi.EROSubobjectSerializer;
 import org.opendaylight.protocol.rsvp.parser.spi.RSVPParsingException;
@@ -46,13 +44,10 @@ public class SimpleEROSubobjectRegistryTest {
         Mockito.doReturn(new SubobjectContainerBuilder().build()).when(this.rroSubobjectParser).parseSubobject(this.input, false);
         final ArgumentCaptor<SubobjectContainer> arg = ArgumentCaptor.forClass(SubobjectContainer.class);
         final ArgumentCaptor<ByteBuf> bufArg = ArgumentCaptor.forClass(ByteBuf.class);
-        Mockito.doAnswer(new Answer<Object>() {
-            @Override
-            public Object answer(final InvocationOnMock invocation) throws Throwable {
-                final Object[] args = invocation.getArguments();
-                ((ByteBuf) args[1]).writeBoolean(Boolean.TRUE);
-                return null;
-            }
+        Mockito.doAnswer(invocation -> {
+            final Object[] args = invocation.getArguments();
+            ((ByteBuf) args[1]).writeBoolean(Boolean.TRUE);
+            return null;
         }).when(this.rroSubobjectSerializer).serializeSubobject(arg.capture(), bufArg.capture());
     }
 
index 4866e1ca70731a701b2624e92acfb6a0053acd62..9d116824bce59cd8ad4a1c3a6b7b892fa7b49b05 100644 (file)
@@ -19,8 +19,6 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 import org.opendaylight.protocol.rsvp.parser.spi.RROSubobjectParser;
 import org.opendaylight.protocol.rsvp.parser.spi.RROSubobjectSerializer;
 import org.opendaylight.protocol.rsvp.parser.spi.RSVPParsingException;
@@ -47,13 +45,10 @@ public class SimpleRROSubobjectRegistryTest {
         Mockito.doReturn(new SubobjectContainerBuilder().build()).when(this.rroSubobjectParser).parseSubobject(this.input);
         final ArgumentCaptor<SubobjectContainer> arg = ArgumentCaptor.forClass(SubobjectContainer.class);
         final ArgumentCaptor<ByteBuf> bufArg = ArgumentCaptor.forClass(ByteBuf.class);
-        Mockito.doAnswer(new Answer<Object>() {
-            @Override
-            public Object answer(final InvocationOnMock invocation) throws Throwable {
-                final Object[] args = invocation.getArguments();
-                ((ByteBuf) args[1]).writeBoolean(Boolean.TRUE);
-                return null;
-            }
+        Mockito.doAnswer(invocation -> {
+            final Object[] args = invocation.getArguments();
+            ((ByteBuf) args[1]).writeBoolean(Boolean.TRUE);
+            return null;
         }).when(this.rroSubobjectSerializer).serializeSubobject(arg.capture(), bufArg.capture());
     }
 
index e1c33ded7d2fc88351512f8d3838389f10fa93a3..71bb0b0e6671bfd4fbff74e111ef2eac90c32cec 100644 (file)
@@ -19,8 +19,6 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 import org.opendaylight.protocol.rsvp.parser.spi.RSVPParsingException;
 import org.opendaylight.protocol.rsvp.parser.spi.XROSubobjectParser;
 import org.opendaylight.protocol.rsvp.parser.spi.XROSubobjectSerializer;
@@ -47,13 +45,10 @@ public class SimpleXROSubobjectRegistryTest {
             .input, false);
         final ArgumentCaptor<SubobjectContainer> arg = ArgumentCaptor.forClass(SubobjectContainer.class);
         final ArgumentCaptor<ByteBuf> bufArg = ArgumentCaptor.forClass(ByteBuf.class);
-        Mockito.doAnswer(new Answer<Object>() {
-            @Override
-            public Object answer(final InvocationOnMock invocation) throws Throwable {
-                final Object[] args = invocation.getArguments();
-                ((ByteBuf) args[1]).writeBoolean(Boolean.TRUE);
-                return null;
-            }
+        Mockito.doAnswer(invocation -> {
+            final Object[] args = invocation.getArguments();
+            ((ByteBuf) args[1]).writeBoolean(Boolean.TRUE);
+            return null;
         }).when(this.rroSubobjectSerializer).serializeSubobject(arg.capture(), bufArg.capture());
     }
 
index cf5d21babcfb1d987700f80e21da6c02be17e38b..6d6cf4ab5a2470e60e2b31bd3efbebe6190b7521 100644 (file)
@@ -18,8 +18,6 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 import org.opendaylight.protocol.rsvp.parser.spi.EROSubobjectRegistry;
 import org.opendaylight.protocol.rsvp.parser.spi.RSVPParsingException;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.AttributeFilter;
@@ -39,22 +37,16 @@ public class EROSubobjectListParserTest {
 
     @Before
     public void setUp() throws RSVPParsingException {
-        Mockito.doAnswer(new Answer<Object>() {
-            @Override
-            public Object answer(final InvocationOnMock invocation) throws Throwable {
-                if (((ByteBuf) invocation.getArguments()[1]).readableBytes() == 0) {
-                    return null;
-                }
-                return EROSubobjectListParserTest.this.subObj;
+        Mockito.doAnswer(invocation -> {
+            if (((ByteBuf) invocation.getArguments()[1]).readableBytes() == 0) {
+                return null;
             }
+            return EROSubobjectListParserTest.this.subObj;
         }).when(this.registry).parseSubobject(Mockito.anyInt(), Mockito.any(ByteBuf.class), Mockito.anyBoolean());
         Mockito.doReturn("lala").when(this.subObj).toString();
-        Mockito.doAnswer(new Answer<Object>() {
-            @Override
-            public Object answer(final InvocationOnMock invocation) throws Throwable {
-                ((ByteBuf) invocation.getArguments()[1]).writeByte(1);
-                return null;
-            }
+        Mockito.doAnswer(invocation -> {
+            ((ByteBuf) invocation.getArguments()[1]).writeByte(1);
+            return null;
         }).when(this.registry).serializeSubobject(Mockito.any(SubobjectContainer.class), Mockito.any(ByteBuf.class));
     }
 
index 9d935da94d500dc55436d87ecaad774ead76235b..6912aac3911b1e7f43af2680f852fbcbb02e5c8b 100644 (file)
@@ -15,8 +15,6 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 import org.opendaylight.protocol.rsvp.parser.spi.RROSubobjectRegistry;
 import org.opendaylight.protocol.rsvp.parser.spi.RSVPParsingException;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.RsvpTeObject;
@@ -34,22 +32,16 @@ public class RROSubobjectListParserTest {
 
     @Before
     public void setUp() throws RSVPParsingException {
-        Mockito.doAnswer(new Answer<Object>() {
-            @Override
-            public Object answer(final InvocationOnMock invocation) throws Throwable {
-                if (((ByteBuf) invocation.getArguments()[1]).readableBytes() == 0) {
-                    return null;
-                }
-                return RROSubobjectListParserTest.this.subObj;
+        Mockito.doAnswer(invocation -> {
+            if (((ByteBuf) invocation.getArguments()[1]).readableBytes() == 0) {
+                return null;
             }
+            return RROSubobjectListParserTest.this.subObj;
         }).when(this.registry).parseSubobject(Mockito.anyInt(), Mockito.any(ByteBuf.class));
         Mockito.doReturn("lala").when(this.subObj).toString();
-        Mockito.doAnswer(new Answer<Object>() {
-            @Override
-            public Object answer(final InvocationOnMock invocation) throws Throwable {
-                ((ByteBuf) invocation.getArguments()[1]).writeByte(1);
-                return null;
-            }
+        Mockito.doAnswer(invocation -> {
+            ((ByteBuf) invocation.getArguments()[1]).writeByte(1);
+            return null;
         }).when(this.registry).serializeSubobject(Mockito.any(SubobjectContainer.class), Mockito.any(ByteBuf.class));
     }
 
index 5794532ee781564cda9e793de74f4244b20faa3f..7c2cc8bf1480d2d042f1308a47664b2a9b7fc1b9 100644 (file)
@@ -15,8 +15,6 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 import org.opendaylight.protocol.rsvp.parser.spi.RSVPParsingException;
 import org.opendaylight.protocol.rsvp.parser.spi.XROSubobjectRegistry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.RsvpTeObject;
@@ -34,22 +32,16 @@ public class XROSubobjectListParserTest {
 
     @Before
     public void setUp() throws RSVPParsingException {
-        Mockito.doAnswer(new Answer<Object>() {
-            @Override
-            public Object answer(final InvocationOnMock invocation) throws Throwable {
-                if (((ByteBuf) invocation.getArguments()[1]).readableBytes() == 0) {
-                    return null;
-                }
-                return XROSubobjectListParserTest.this.subObj;
+        Mockito.doAnswer(invocation -> {
+            if (((ByteBuf) invocation.getArguments()[1]).readableBytes() == 0) {
+                return null;
             }
+            return XROSubobjectListParserTest.this.subObj;
         }).when(this.registry).parseSubobject(Mockito.anyInt(), Mockito.any(ByteBuf.class), Mockito.anyBoolean());
         Mockito.doReturn("lala").when(this.subObj).toString();
-        Mockito.doAnswer(new Answer<Object>() {
-            @Override
-            public Object answer(final InvocationOnMock invocation) throws Throwable {
-                ((ByteBuf) invocation.getArguments()[1]).writeByte(1);
-                return null;
-            }
+        Mockito.doAnswer(invocation -> {
+            ((ByteBuf) invocation.getArguments()[1]).writeByte(1);
+            return null;
         }).when(this.registry).serializeSubobject(Mockito.any(SubobjectContainer.class), Mockito.any(ByteBuf.class));
     }