From 5ddbbec3193f9dfcbb980379a5454b70fe4847ea Mon Sep 17 00:00:00 2001 From: "Claudio D. Gasparini" Date: Mon, 21 Aug 2017 09:40:08 +0200 Subject: [PATCH] Replace Preconditions.CheckNotNull per RequireNonNull Change-Id: I41b155a876cdb10911ea28a31fe4040f5fe1bd53 Signed-off-by: Claudio D. Gasparini --- .../bgp/benchmark/app/AppPeerBenchmark.java | 11 ++++-- .../bmp/impl/BmpByteToMessageDecoder.java | 8 ++-- .../protocol/bmp/impl/BmpDispatcherImpl.java | 29 ++++++++------ .../protocol/bmp/impl/BmpHandlerFactory.java | 4 +- .../bmp/impl/BmpMessageToByteEncoder.java | 8 ++-- .../impl/app/BmpMonitoringStationImpl.java | 11 +++--- .../protocol/bmp/impl/app/BmpRouterImpl.java | 17 ++++++--- .../bmp/impl/app/BmpRouterPeerImpl.java | 9 +++-- .../bmp/impl/app/RouterSessionManager.java | 7 ++-- .../protocol/bmp/impl/app/TableContext.java | 5 ++- .../impl/config/BmpDeployerDependencies.java | 13 ++++--- .../bmp/impl/config/BmpDeployerImpl.java | 7 ++-- .../bmp/impl/session/BmpSessionImpl.java | 6 ++- .../protocol/bmp/mock/BmpMockDispatcher.java | 13 ++++--- .../bmp/parser/message/PeerDownHandler.java | 3 +- .../bmp/parser/message/PeerUpHandler.java | 6 ++- .../RouteMonitoringMessageHandler.java | 4 +- .../bmp/parser/tlv/StatType009TlvHandler.java | 6 ++- .../bmp/parser/tlv/StatType010TlvHandler.java | 6 ++- .../AbstractBmpMessageWithTlvParser.java | 4 +- .../AbstractBmpPerPeerMessageParser.java | 4 +- ...AbstractBmpExtensionProviderActivator.java | 4 +- ...eBmpExtensionProviderContextActivator.java | 7 ++-- .../bgp/concepts/RouteDistinguisherUtil.java | 4 +- .../config/loader/impl/ConfigLoaderImpl.java | 11 +++--- .../bgp/evpn/impl/nlri/EthSegRParser.java | 3 +- .../evpn/impl/nlri/IncMultEthTagRParser.java | 3 +- .../flowspec/AbstractFlowspecNlriParser.java | 8 ++-- .../flowspec/AbstractFlowspecRIBSupport.java | 4 +- .../protocol/bgp/flowspec/BGPActivator.java | 4 +- .../flowspec/FSDestinationPortHandler.java | 4 +- .../protocol/bgp/flowspec/FSDscpHandler.java | 4 +- .../bgp/flowspec/FSIcmpCodeHandler.java | 4 +- .../bgp/flowspec/FSIcmpTypeHandler.java | 4 +- .../bgp/flowspec/FSIpProtocolHandler.java | 4 +- .../bgp/flowspec/FSPacketLengthHandler.java | 4 +- .../protocol/bgp/flowspec/FSPortHandler.java | 4 +- .../bgp/flowspec/FSSourcePortHandler.java | 4 +- .../bgp/flowspec/FSTcpFlagsHandler.java | 4 +- .../bgp/flowspec/FlowspecActivator.java | 5 ++- .../flowspec/SimpleFlowspecTypeRegistry.java | 7 ++-- .../FSIpv4DestinationPrefixHandler.java | 4 +- .../handlers/FSIpv4SourcePrefixHandler.java | 4 +- .../FSIpv6DestinationPrefixHandler.java | 4 +- .../handlers/FSIpv6SourcePrefixHandler.java | 4 +- .../AbstractFlowspecL3vpnNlriParser.java | 6 +-- .../spi/pojo/SimpleNlriTypeRegistry.java | 8 ++-- ...BGPTableTypeRegistryProviderActivator.java | 4 +- ...BGPTableTypeRegistryProviderActivator.java | 6 ++- .../protocol/bgp/state/StateProviderImpl.java | 11 +++--- .../protocol/bgp/parser/BgpTableTypeImpl.java | 7 ++-- .../impl/message/BGPOpenMessageParser.java | 4 +- .../message/BGPRouteRefreshMessageParser.java | 6 ++- .../impl/message/BGPUpdateMessageParser.java | 6 ++- .../open/AddPathCapabilityHandler.java | 6 ++- .../open/CapabilityParameterParser.java | 4 +- .../open/GracefulCapabilityHandler.java | 5 ++- .../open/MultiProtocolCapabilityHandler.java | 7 ++-- .../update/AggregatorAttributeParser.java | 4 +- .../message/update/AsPathAttributeParser.java | 4 +- .../update/BgpPrefixSidAttributeParser.java | 4 +- .../update/CommunitiesAttributeParser.java | 4 +- .../impl/message/update/CommunityUtil.java | 5 ++- .../ExtendedCommunitiesAttributeParser.java | 4 +- .../update/MPReachAttributeParser.java | 4 +- .../update/MPUnreachAttributeParser.java | 4 +- ...AbstractBGPExtensionProviderActivator.java | 4 +- .../parser/spi/AbstractMessageRegistry.java | 4 +- .../bgp/parser/spi/MultiPathSupportUtil.java | 5 ++- .../spi/pojo/AbstractFamilyRegistry.java | 4 +- .../parser/spi/pojo/MultiPathSupportImpl.java | 5 ++- .../PeerSpecificParserConstraintImpl.java | 6 ++- .../spi/pojo/SimpleAttributeRegistry.java | 6 ++- ...eBGPExtensionProviderContextActivator.java | 7 ++-- .../parser/spi/pojo/SimpleNlriRegistry.java | 10 +++-- .../bgp/mode/impl/BestPathStateImpl.java | 5 ++- .../bgp/mode/impl/add/AddPathBestPath.java | 5 ++- .../bgp/mode/impl/add/AddPathSelector.java | 5 ++- .../all/paths/AbstractAllPathsRouteEntry.java | 5 ++- .../bgp/mode/impl/base/BaseBestPath.java | 5 ++- .../bgp/mode/impl/base/BasePathSelector.java | 5 ++- .../bgp/mode/spi/AbstractBestPath.java | 5 ++- .../peer/acceptor/BGPPeerAcceptorImpl.java | 6 ++- .../protocol/bgp/rib/DefaultRibReference.java | 5 ++- .../yang/bgp/rib/impl/AddPathImplModule.java | 7 ++-- .../yang/bgp/rib/impl/BGPPSMImplModule.java | 7 ++-- .../bgp/rib/impl/BGPTableTypeImplModule.java | 7 ++-- .../impl/AbstractBGPSessionNegotiator.java | 7 ++-- .../impl/AbstractReflectingExportPolicy.java | 7 ++-- .../protocol/bgp/rib/impl/AdjRibInWriter.java | 11 +++--- .../bgp/rib/impl/AdjRibOutListener.java | 7 ++-- .../bgp/rib/impl/ApplicationPeer.java | 5 ++- .../bgp/rib/impl/BGPByteToMessageDecoder.java | 5 ++- .../bgp/rib/impl/BGPDispatcherImpl.java | 9 +++-- .../bgp/rib/impl/BGPHandlerFactory.java | 5 ++- .../bgp/rib/impl/BGPMessageToByteEncoder.java | 5 ++- .../protocol/bgp/rib/impl/BGPPeer.java | 4 +- .../protocol/bgp/rib/impl/BGPSessionImpl.java | 6 ++- .../bgp/rib/impl/BGPSynchronization.java | 5 ++- .../protocol/bgp/rib/impl/BgpPeerRpc.java | 7 ++-- .../bgp/rib/impl/CachingImportPolicy.java | 5 ++- .../bgp/rib/impl/ChannelOutputLimiter.java | 5 ++- .../protocol/bgp/rib/impl/CodecsImpl.java | 4 +- .../bgp/rib/impl/CodecsRegistryImpl.java | 7 ++-- .../bgp/rib/impl/EffectiveRibInWriter.java | 10 +++-- .../rib/impl/ExportPolicyPeerTrackerImpl.java | 7 ++-- .../rib/impl/FromInternalImportPolicy.java | 7 ++-- .../rib/impl/ImportPolicyPeerTrackerImpl.java | 5 ++- .../protocol/bgp/rib/impl/LocRibWriter.java | 13 ++++--- .../bgp/rib/impl/PeerExportGroupImpl.java | 5 ++- .../impl/ProtocolsConfigFileProcessor.java | 7 ++-- .../protocol/bgp/rib/impl/RIBImpl.java | 19 +++++----- .../bgp/rib/impl/RIBSupportContextImpl.java | 5 ++- .../impl/RIBSupportContextRegistryImpl.java | 7 ++-- .../protocol/bgp/rib/impl/RouteUpdateKey.java | 7 ++-- .../bgp/rib/impl/StrictBGPPeerRegistry.java | 38 ++++++++++--------- .../protocol/bgp/rib/impl/TableContext.java | 6 ++- .../bgp/rib/impl/ToExternalExportPolicy.java | 4 +- .../bgp/rib/impl/config/BgpDeployerImpl.java | 10 ++--- .../protocol/bgp/rib/impl/config/BgpPeer.java | 3 +- .../protocol/bgp/rib/impl/config/RibImpl.java | 3 +- .../protocol/BGPProtocolSessionPromise.java | 10 +++-- .../impl/protocol/BGPReconnectPromise.java | 15 ++++---- .../bgp/rib/impl/state/BGPPeerStateImpl.java | 8 ++-- .../bgp/rib/impl/state/BGPRIBStateImpl.java | 6 ++- .../rib/impl/stats/peer/BGPPeerStatsImpl.java | 9 +++-- .../impl/stats/peer/BGPSessionStatsImpl.java | 20 +++++----- .../peer/route/PerTableTypeRouteCounter.java | 8 ++-- .../stats/rib/impl/BGPRenderStatsImpl.java | 9 +++-- ...AbstractRIBExtensionProviderActivator.java | 4 +- .../bgp/rib/spi/AbstractRIBSupport.java | 9 +++-- ...viceLoaderRIBExtensionConsumerContext.java | 4 +- .../SimpleRIBExtensionProviderContext.java | 4 +- ...eRIBExtensionProviderContextActivator.java | 7 ++-- .../AbstractReachabilityTopologyBuilder.java | 4 +- .../provider/AbstractTopologyBuilder.java | 12 +++--- .../provider/LinkstateTopologyBuilder.java | 8 ++-- .../NetworkTopologyConfigFileProcessor.java | 7 ++-- .../config/BgpTopologyDeployerImpl.java | 8 ++-- ...TopologyReferenceSingletonServiceImpl.java | 6 ++- .../provider/AbstractTopologyBuilderTest.java | 5 ++- .../bgp/util/HexDumpBGPFileParser.java | 4 +- .../concepts/DefaultInstanceReference.java | 4 +- .../TopologyDataChangeCounterDeployer.java | 4 +- .../AbstractEROWithSubobjectsParser.java | 4 +- .../AbstractRROWithSubobjectsParser.java | 4 +- .../AbstractXROWithSubobjectsParser.java | 4 +- .../subobject/EROLabelSubobjectParser.java | 4 +- .../subobject/RROLabelSubobjectParser.java | 6 ++- .../pcep/impl/AbstractSessionNegotiator.java | 7 ++-- .../impl/DefaultPCEPSessionNegotiator.java | 5 ++- .../DefaultPCEPSessionNegotiatorFactory.java | 5 ++- .../pcep/impl/PCEPByteToMessageDecoder.java | 5 ++- .../pcep/impl/PCEPDispatcherImpl.java | 11 +++--- .../pcep/impl/PCEPHandlerFactory.java | 4 +- .../pcep/impl/PCEPMessageToByteEncoder.java | 7 ++-- .../pcep/impl/PCEPProtocolSessionPromise.java | 6 ++- .../protocol/pcep/impl/PCEPSessionImpl.java | 11 +++--- .../protocol/pcep/impl/PCEPSessionState.java | 11 +++--- .../pcep/impl/tls/SslContextFactory.java | 5 ++- .../pcep/impl/PCEPDispatcherImplTest.java | 10 ++--- .../pcep/pcc/mock/PCCSyncOptimization.java | 5 ++- .../pcep/pcc/mock/PCCTunnelManagerImpl.java | 5 ++- .../pcc/mock/protocol/PCCPeerProposal.java | 5 ++- .../mock/protocol/PCCReconnectPromise.java | 5 ++- .../mock/protocol/PCCServerPeerProposal.java | 5 ++- .../pcep/spi/AbstractMessageParser.java | 7 ++-- .../spi/AbstractObjectWithTlvsParser.java | 8 ++-- .../protocol/pcep/spi/UnknownObject.java | 5 ++- ...bstractPCEPExtensionProviderActivator.java | 4 +- ...PCEPExtensionProviderContextActivator.java | 7 ++-- .../AbstractTopologySessionListener.java | 10 +++-- .../provider/PCEPStatefulPeerProposal.java | 7 ++-- .../provider/PCEPTopologyProvider.java | 12 +++--- .../provider/ServerSessionManager.java | 10 ++--- .../provider/SessionListenerState.java | 11 +++--- .../Stateful07TopologySessionListener.java | 4 +- .../topology/provider/SyncOptimization.java | 5 ++- .../provider/TopologyProgramming.java | 6 ++- .../pcep/topology/provider/TopologyRPCs.java | 4 +- .../config/PCEPTopologyDeployerImpl.java | 4 +- .../config/PCEPTopologyProviderBean.java | 14 ++++--- .../spi/AbstractInstructionExecutor.java | 5 ++- .../CreateTunnelInstructionExecutor.java | 16 ++++---- .../tunnel/provider/NodeChangedListener.java | 8 ++-- .../provider/PCEPTunnelTopologyProvider.java | 5 ++- .../tunnel/provider/TunnelProgramming.java | 9 +++-- .../UpdateTunnelInstructionExecutor.java | 5 ++- .../impl/InstructionDeployerImpl.java | 15 ++++---- .../programming/impl/InstructionImpl.java | 12 +++--- .../impl/ProgrammingServiceImpl.java | 15 ++++---- .../topology/TopologyProgrammingUtil.java | 5 ++- .../tunnel/TunnelProgrammingUtil.java | 5 ++- .../ero/EROLabelSubobjectParser.java | 4 +- .../rro/RROLabelSubobjectParser.java | 6 ++- ...bstractRSVPExtensionProviderActivator.java | 4 +- ...RSVPExtensionProviderContextActivator.java | 7 ++-- .../subobjects/EROSubobjectListParser.java | 4 +- .../subobjects/RROSubobjectListParser.java | 4 +- .../subobjects/XROSubobjectListParser.java | 4 +- .../opendaylight/protocol/util/BitArray.java | 6 ++- .../protocol/util/PCEPHexDumpParser.java | 4 +- 202 files changed, 825 insertions(+), 529 deletions(-) diff --git a/bgp/benchmark-app/src/main/java/org/opendaylight/protocol/bgp/benchmark/app/AppPeerBenchmark.java b/bgp/benchmark-app/src/main/java/org/opendaylight/protocol/bgp/benchmark/app/AppPeerBenchmark.java index beb29f48fd..106640e1b8 100644 --- a/bgp/benchmark-app/src/main/java/org/opendaylight/protocol/bgp/benchmark/app/AppPeerBenchmark.java +++ b/bgp/benchmark-app/src/main/java/org/opendaylight/protocol/bgp/benchmark/app/AppPeerBenchmark.java @@ -8,8 +8,9 @@ package org.opendaylight.protocol.bgp.benchmark.app; +import static java.util.Objects.requireNonNull; + import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; import com.google.common.base.Stopwatch; import com.google.common.net.InetAddresses; import com.google.common.util.concurrent.FutureCallback; @@ -102,7 +103,7 @@ public class AppPeerBenchmark implements OdlBgpAppPeerBenchmarkService, Transact public AppPeerBenchmark(final DataBroker bindingDataBroker, final RpcProviderRegistry rpcProviderRegistry, final String appRibId) { - this.appRibId = Preconditions.checkNotNull(appRibId); + this.appRibId = requireNonNull(appRibId); this.txChain = bindingDataBroker.createTransactionChain(this); this.appIID = InstanceIdentifier.builder(ApplicationRib.class, @@ -205,13 +206,15 @@ public class AppPeerBenchmark implements OdlBgpAppPeerBenchmarkService, Transact return processRoutes(ipv4Prefix, count, batch, null); } - private long processRoutes(final Ipv4Prefix ipv4Prefix, final long count, final long batch, final Attributes attributes) { + private long processRoutes(final Ipv4Prefix ipv4Prefix, final long count, final long batch, + final Attributes attributes) { WriteTransaction wTx = this.txChain.newWriteOnlyTransaction(); String address = getAdddressFromPrefix(ipv4Prefix); final Stopwatch stopwatch = Stopwatch.createStarted(); for (int i = 1; i <= count; i++) { final Ipv4RouteKey routeKey = new Ipv4RouteKey(PATH_ID, createPrefix(address)); - final KeyedInstanceIdentifier routeIId = this.routesIId.child(Ipv4Route.class, routeKey); + final KeyedInstanceIdentifier routeIId = + this.routesIId.child(Ipv4Route.class, routeKey); if (attributes != null) { final Ipv4RouteBuilder ipv4RouteBuilder = new Ipv4RouteBuilder(); ipv4RouteBuilder.setPrefix(routeKey.getPrefix()); diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/BmpByteToMessageDecoder.java b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/BmpByteToMessageDecoder.java index 5931d2a1e0..e0d581cb9b 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/BmpByteToMessageDecoder.java +++ b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/BmpByteToMessageDecoder.java @@ -8,7 +8,8 @@ package org.opendaylight.protocol.bmp.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufUtil; import io.netty.channel.ChannelHandlerContext; @@ -25,11 +26,12 @@ public class BmpByteToMessageDecoder extends ByteToMessageDecoder { private final BmpMessageRegistry registry; public BmpByteToMessageDecoder(final BmpMessageRegistry registry) { - this.registry = Preconditions.checkNotNull(registry); + this.registry = requireNonNull(registry); } @Override - protected void decode(final ChannelHandlerContext ctx, final ByteBuf in, final List out) throws BmpDeserializationException { + protected void decode(final ChannelHandlerContext ctx, final ByteBuf in, final List out) + throws BmpDeserializationException { if (in.isReadable()) { LOG.trace("Received to decode: {}", ByteBufUtil.hexDump(in)); out.add(this.registry.parseMessage(in)); diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/BmpDispatcherImpl.java b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/BmpDispatcherImpl.java index eade9264ad..94df95ccf2 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/BmpDispatcherImpl.java +++ b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/BmpDispatcherImpl.java @@ -8,7 +8,8 @@ package org.opendaylight.protocol.bmp.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import io.netty.bootstrap.Bootstrap; import io.netty.bootstrap.ServerBootstrap; import io.netty.buffer.PooledByteBufAllocator; @@ -59,19 +60,20 @@ public class BmpDispatcherImpl implements BmpDispatcher { this.bossGroup = new EpollEventLoopGroup(); this.workerGroup = new EpollEventLoopGroup(); } else { - this.bossGroup = Preconditions.checkNotNull(bossGroup); - this.workerGroup = Preconditions.checkNotNull(workerGroup); + this.bossGroup = requireNonNull(bossGroup); + this.workerGroup = requireNonNull(workerGroup); } - this.hf = new BmpHandlerFactory(Preconditions.checkNotNull(registry)); - this.sessionFactory = Preconditions.checkNotNull(sessionFactory); + this.hf = new BmpHandlerFactory(requireNonNull(registry)); + this.sessionFactory = requireNonNull(sessionFactory); } @Override - public ChannelFuture createClient(final InetSocketAddress address, final BmpSessionListenerFactory slf, final KeyMapping keys) { + public ChannelFuture createClient(final InetSocketAddress address, final BmpSessionListenerFactory slf, + final KeyMapping keys) { final Bootstrap b = new Bootstrap(); - Preconditions.checkNotNull(address); + requireNonNull(address); if (Epoll.isAvailable()) { b.channel(EpollSocketChannel.class); @@ -104,9 +106,10 @@ public class BmpDispatcherImpl implements BmpDispatcher { } @Override - public ChannelFuture createServer(final InetSocketAddress address, final BmpSessionListenerFactory slf, final KeyMapping keys) { - Preconditions.checkNotNull(address); - Preconditions.checkNotNull(slf); + public ChannelFuture createServer(final InetSocketAddress address, final BmpSessionListenerFactory slf, + final KeyMapping keys) { + requireNonNull(address); + requireNonNull(slf); final ServerBootstrap b = new ServerBootstrap(); b.childHandler(new ChannelInitializer() { @@ -170,13 +173,15 @@ public class BmpDispatcherImpl implements BmpDispatcher { LOG.debug("Connection {} succeeded!", cf); } else { if (this.delay > MAXIMUM_BACKOFF) { - LOG.warn("The time of maximum backoff has been exceeded. No further connection attempts with BMP router {}.", this.address); + LOG.warn("The time of maximum backoff has been exceeded. No further connection attempts with BMP " + + "router {}.", this.address); cf.cancel(false); return; } final EventLoop loop = cf.channel().eventLoop(); loop.schedule(() -> this.bootstrap.connect().addListener(this), this.delay, TimeUnit.MILLISECONDS); - LOG.info("The connection try to BMP router {} failed. Next reconnection attempt in {} milliseconds.", this.address, this.delay); + LOG.info("The connection try to BMP router {} failed. Next reconnection attempt in {} milliseconds.", + this.address, this.delay); this.delay *= 2; } } diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/BmpHandlerFactory.java b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/BmpHandlerFactory.java index d1154de59d..d4c8b5f364 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/BmpHandlerFactory.java +++ b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/BmpHandlerFactory.java @@ -7,7 +7,7 @@ */ package org.opendaylight.protocol.bmp.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelOutboundHandler; @@ -19,7 +19,7 @@ public class BmpHandlerFactory { private final BmpMessageRegistry registry; public BmpHandlerFactory(final BmpMessageRegistry registry) { - this.registry = Preconditions.checkNotNull(registry); + this.registry = requireNonNull(registry); this.encoder = new BmpMessageToByteEncoder(registry); } diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/BmpMessageToByteEncoder.java b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/BmpMessageToByteEncoder.java index a9200e9d16..42d3b90f1a 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/BmpMessageToByteEncoder.java +++ b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/BmpMessageToByteEncoder.java @@ -8,7 +8,8 @@ package org.opendaylight.protocol.bmp.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandler.Sharable; import io.netty.channel.ChannelHandlerContext; @@ -26,11 +27,12 @@ public class BmpMessageToByteEncoder extends MessageToByteEncoder private final BmpMessageRegistry registry; public BmpMessageToByteEncoder(final BmpMessageRegistry registry) { - this.registry = Preconditions.checkNotNull(registry); + this.registry = requireNonNull(registry); } @Override - protected void encode(final ChannelHandlerContext ctx, final Notification message, final ByteBuf out) throws Exception { + protected void encode(final ChannelHandlerContext ctx, final Notification message, final ByteBuf out) + throws Exception { LOG.trace("Encoding message: {}", message); this.registry.serializeMessage(message, out); LOG.debug("Message sent to output: {}", message); diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpMonitoringStationImpl.java b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpMonitoringStationImpl.java index 1027211099..b5a6329387 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpMonitoringStationImpl.java +++ b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpMonitoringStationImpl.java @@ -8,6 +8,7 @@ package org.opendaylight.protocol.bmp.impl.app; +import static java.util.Objects.requireNonNull; import static org.opendaylight.protocol.bmp.impl.app.KeyConstructorUtil.constructKeys; import com.google.common.base.Optional; @@ -66,11 +67,11 @@ public final class BmpMonitoringStationImpl implements BmpMonitoringStation, Clu public BmpMonitoringStationImpl(final BmpDeployerDependencies bmpDeployerDependencies, final BmpDispatcher dispatcher, final MonitorId monitorId, final InetSocketAddress address, final List mrs) { - this.domDataBroker = Preconditions.checkNotNull(bmpDeployerDependencies.getDomDataBroker()); - this.dispatcher = Preconditions.checkNotNull(dispatcher); + this.domDataBroker = requireNonNull(bmpDeployerDependencies.getDomDataBroker()); + this.dispatcher = requireNonNull(dispatcher); this.monitorId = monitorId; this.monitoredRouters = mrs; - this.address = Preconditions.checkNotNull(address); + this.address = requireNonNull(address); this.yangMonitorId = YangInstanceIdentifier.builder() .node(BmpMonitor.QNAME).node(Monitor.QNAME) @@ -130,8 +131,8 @@ public final class BmpMonitoringStationImpl implements BmpMonitoringStation, Clu if (this.monitoredRouters != null) { for (final MonitoredRouter mr : this.monitoredRouters) { if (mr.isActive()) { - Preconditions.checkNotNull(mr.getAddress()); - Preconditions.checkNotNull(mr.getPort()); + requireNonNull(mr.getAddress()); + requireNonNull(mr.getPort()); final String s = mr.getAddress().getIpv4Address().getValue(); final InetAddress addr = InetAddresses.forString(s); final KeyMapping ret; diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterImpl.java b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterImpl.java index 498e063215..fe95c515de 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterImpl.java +++ b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterImpl.java @@ -8,6 +8,8 @@ package org.opendaylight.protocol.bmp.impl.app; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import com.google.common.net.InetAddresses; import java.util.HashMap; @@ -75,7 +77,7 @@ public class BmpRouterImpl implements BmpRouter, TransactionChainListener { private YangInstanceIdentifier peersYangIId; public BmpRouterImpl(final RouterSessionManager sessionManager) { - this.sessionManager = Preconditions.checkNotNull(sessionManager); + this.sessionManager = requireNonNull(sessionManager); this.domDataBroker = sessionManager.getDomDataBroker(); this.domTxChain = this.domDataBroker.createTransactionChain(this); this.extensions = sessionManager.getExtensions(); @@ -89,11 +91,12 @@ public class BmpRouterImpl implements BmpRouter, TransactionChainListener { this.routerId = new RouterId(Ipv4Util.getIpAddress(this.session.getRemoteAddress())); // check if this session is redundant if (!this.sessionManager.addSessionListener(this)) { - LOG.warn("Redundant BMP session with remote router {} ({}) detected. This BMP session will be abandoned.", this.routerIp, this.session); + LOG.warn("Redundant BMP session with remote router {} ({}) detected. This BMP session will be abandoned.", + this.routerIp, this.session); this.close(); } else { - this.routerYangIId = YangInstanceIdentifier.builder(this.sessionManager.getRoutersYangIId()).nodeWithKey(Router.QNAME, - ROUTER_ID_QNAME, this.routerIp).build(); + this.routerYangIId = YangInstanceIdentifier.builder(this.sessionManager.getRoutersYangIId()) + .nodeWithKey(Router.QNAME, ROUTER_ID_QNAME, this.routerIp).build(); this.peersYangIId = YangInstanceIdentifier.builder(this.routerYangIId).node(Peer.QNAME).build(); createRouterEntry(); LOG.info("BMP session with remote router {} ({}) is up now.", this.routerIp, this.session); @@ -173,7 +176,8 @@ public class BmpRouterImpl implements BmpRouter, TransactionChainListener { } @Override - public void onTransactionChainFailed(final TransactionChain chain, final AsyncTransaction transaction, final Throwable cause) { + public void onTransactionChainFailed(final TransactionChain chain, final AsyncTransaction transaction, + final Throwable cause) { LOG.error("Transaction chain failed.", cause); } @@ -214,7 +218,8 @@ public class BmpRouterImpl implements BmpRouter, TransactionChainListener { private void onPeerUp(final PeerUpNotification peerUp) { final PeerId peerId = getPeerIdFromOpen(peerUp.getReceivedOpen()); if (!getPeer(peerId).isPresent()) { - final BmpRouterPeer peer = BmpRouterPeerImpl.createRouterPeer(this.domTxChain, this.peersYangIId, peerUp, this.extensions, this.tree, peerId); + final BmpRouterPeer peer = BmpRouterPeerImpl.createRouterPeer(this.domTxChain, this.peersYangIId, peerUp, + this.extensions, this.tree, peerId); this.peers.put(peerId, peer); LOG.debug("Router {}: Peer {} goes up.", this.routerIp, peerId.getValue()); } else { diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterPeerImpl.java b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterPeerImpl.java index 65baeb17e9..004910e48e 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterPeerImpl.java +++ b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterPeerImpl.java @@ -8,6 +8,7 @@ package org.opendaylight.protocol.bmp.impl.app; +import static java.util.Objects.requireNonNull; import static org.opendaylight.protocol.bmp.impl.app.TablesUtil.BMP_TABLES_QNAME; import com.google.common.base.Preconditions; @@ -123,10 +124,10 @@ public final class BmpRouterPeerImpl implements BmpRouterPeer { private final BindingCodecTreeNode receivedOpenCodec; private boolean up = true; - private BmpRouterPeerImpl(final DOMTransactionChain domTxChain, final YangInstanceIdentifier peersYangIId, final PeerId peerId, - final RIBExtensionConsumerContext extensions, final PeerUpNotification peerUp, - final BindingCodecTree tree) { - this.domTxChain = Preconditions.checkNotNull(domTxChain); + private BmpRouterPeerImpl(final DOMTransactionChain domTxChain, final YangInstanceIdentifier peersYangIId, + final PeerId peerId, final RIBExtensionConsumerContext extensions, final PeerUpNotification peerUp, + final BindingCodecTree tree) { + this.domTxChain = requireNonNull(domTxChain); this.peerId = peerId; this.peerYangIId = YangInstanceIdentifier.builder(peersYangIId).nodeWithKey(Peer.QNAME, PEER_ID_QNAME, this.peerId.getValue()).build(); this.sentOpenCodec = tree.getSubtreeCodec(SENT_OPEN_IID); diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/RouterSessionManager.java b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/RouterSessionManager.java index 90eca5e641..1648dc2cdb 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/RouterSessionManager.java +++ b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/RouterSessionManager.java @@ -8,7 +8,8 @@ package org.opendaylight.protocol.bmp.impl.app; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; @@ -48,8 +49,8 @@ final class RouterSessionManager implements BmpSessionListenerFactory, AutoClose } private synchronized boolean isSessionExist(final BmpRouter sessionListener) { - Preconditions.checkNotNull(sessionListener); - return this.sessionListeners.containsKey(Preconditions.checkNotNull(sessionListener.getRouterId())); + requireNonNull(sessionListener); + return this.sessionListeners.containsKey(requireNonNull(sessionListener.getRouterId())); } synchronized boolean addSessionListener(final BmpRouter sessionListener) { diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TableContext.java b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TableContext.java index 8ccb818857..057493b558 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TableContext.java +++ b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TableContext.java @@ -8,6 +8,7 @@ package org.opendaylight.protocol.bmp.impl.app; +import static java.util.Objects.requireNonNull; import static org.opendaylight.protocol.bmp.impl.app.TablesUtil.BMP_ATTRIBUTES_QNAME; import static org.opendaylight.protocol.bmp.impl.app.TablesUtil.BMP_ROUTES_QNAME; @@ -67,8 +68,8 @@ final class TableContext { @SuppressWarnings({ "unchecked", "rawtypes" }) TableContext(final RIBSupport tableSupport, final YangInstanceIdentifier tableId, final BindingCodecTree tree) { - this.tableSupport = Preconditions.checkNotNull(tableSupport); - this.tableId = Preconditions.checkNotNull(tableId); + this.tableSupport = requireNonNull(tableSupport); + this.tableId = requireNonNull(tableId); final BindingCodecTreeNode tableCodecContext = tree.getSubtreeCodec(tableId); final BindingCodecTreeNode routeListCodec = tableCodecContext .streamChild(Routes.class) diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/config/BmpDeployerDependencies.java b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/config/BmpDeployerDependencies.java index d90e3dc4ae..0249b692b7 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/config/BmpDeployerDependencies.java +++ b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/config/BmpDeployerDependencies.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.bmp.impl.config; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; import org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTree; @@ -26,11 +27,11 @@ public class BmpDeployerDependencies { public BmpDeployerDependencies(final DataBroker dataBroker, final DOMDataBroker domDataBroker, final RIBExtensionConsumerContext extensions, final BindingCodecTreeFactory codecTreeFactory, final SchemaContext schemaContext, final ClusterSingletonServiceProvider singletonProvider) { - this.dataBroker = Preconditions.checkNotNull(dataBroker); - this.domDataBroker = Preconditions.checkNotNull(domDataBroker); - this.extensions = Preconditions.checkNotNull(extensions); - this.tree = Preconditions.checkNotNull(codecTreeFactory).create(schemaContext); - this.singletonProvider = Preconditions.checkNotNull(singletonProvider); + this.dataBroker = requireNonNull(dataBroker); + this.domDataBroker = requireNonNull(domDataBroker); + this.extensions = requireNonNull(extensions); + this.tree = requireNonNull(codecTreeFactory).create(schemaContext); + this.singletonProvider = requireNonNull(singletonProvider); } public DataBroker getDataBroker() { diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/config/BmpDeployerImpl.java b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/config/BmpDeployerImpl.java index 3b5b959af7..3478d9b0a0 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/config/BmpDeployerImpl.java +++ b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/config/BmpDeployerImpl.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.bmp.impl.config; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.collect.Iterables; import java.net.InetSocketAddress; import java.util.Collection; @@ -64,8 +65,8 @@ public class BmpDeployerImpl implements BmpDeployer, ClusteredDataTreeChangeList private ListenerRegistration registration; public BmpDeployerImpl(final BmpDispatcher dispatcher, final BmpDeployerDependencies bmpDeployerDependencies) { - this.dispatcher = Preconditions.checkNotNull(dispatcher); - this.bmpDeployerDependencies = Preconditions.checkNotNull(bmpDeployerDependencies); + this.dispatcher = requireNonNull(dispatcher); + this.bmpDeployerDependencies = requireNonNull(bmpDeployerDependencies); } public synchronized void register() { diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/session/BmpSessionImpl.java b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/session/BmpSessionImpl.java index b819f39b67..cb90a03d2c 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/session/BmpSessionImpl.java +++ b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/session/BmpSessionImpl.java @@ -8,6 +8,8 @@ package org.opendaylight.protocol.bmp.impl.session; +import static java.util.Objects.requireNonNull; + import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Preconditions; @@ -39,7 +41,7 @@ public final class BmpSessionImpl extends SimpleChannelInboundHandler> ext } protected final void serializeTlv(final Tlv tlv, final ByteBuf buffer) { - Preconditions.checkNotNull(tlv, "BMP TLV is mandatory."); + requireNonNull(tlv, "BMP TLV is mandatory."); LOG.trace("Serializing BMP TLV {}", tlv); this.tlvRegistry.serializeTlv(tlv, buffer); LOG.trace("Serialized BMP TLV : {}.", ByteBufUtil.hexDump(buffer)); diff --git a/bgp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpPerPeerMessageParser.java b/bgp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpPerPeerMessageParser.java index 955237c0b7..b7e892d222 100644 --- a/bgp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpPerPeerMessageParser.java +++ b/bgp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpPerPeerMessageParser.java @@ -8,6 +8,8 @@ package org.opendaylight.protocol.bmp.spi.parser; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; import org.opendaylight.bgp.concepts.RouteDistinguisherUtil; @@ -44,7 +46,7 @@ public abstract class AbstractBmpPerPeerMessageParser> ext public AbstractBmpPerPeerMessageParser(final MessageRegistry bgpMssageRegistry, final BmpTlvRegistry tlvRegistry) { super(tlvRegistry); - this.bgpMssageRegistry = Preconditions.checkNotNull(bgpMssageRegistry); + this.bgpMssageRegistry = requireNonNull(bgpMssageRegistry); } @Override diff --git a/bgp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/registry/AbstractBmpExtensionProviderActivator.java b/bgp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/registry/AbstractBmpExtensionProviderActivator.java index abef163c50..767bc2db2f 100644 --- a/bgp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/registry/AbstractBmpExtensionProviderActivator.java +++ b/bgp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/registry/AbstractBmpExtensionProviderActivator.java @@ -8,6 +8,8 @@ package org.opendaylight.protocol.bmp.spi.registry; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import java.util.List; import javax.annotation.Nonnull; @@ -35,7 +37,7 @@ public abstract class AbstractBmpExtensionProviderActivator implements AutoClose @Override public final synchronized void start(@Nonnull final BmpExtensionProviderContext context) { Preconditions.checkState(this.registrations == null); - this.registrations = Preconditions.checkNotNull(startImpl(context)); + this.registrations = requireNonNull(startImpl(context)); } @Override diff --git a/bgp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/registry/SimpleBmpExtensionProviderContextActivator.java b/bgp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/registry/SimpleBmpExtensionProviderContextActivator.java index 4930a971d6..00d1bcf931 100644 --- a/bgp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/registry/SimpleBmpExtensionProviderContextActivator.java +++ b/bgp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/registry/SimpleBmpExtensionProviderContextActivator.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.bmp.spi.registry; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,8 +26,8 @@ public class SimpleBmpExtensionProviderContextActivator implements AutoCloseable public SimpleBmpExtensionProviderContextActivator(final BmpExtensionProviderContext providerContext, final List extensionActivators) { - this.providerContext = Preconditions.checkNotNull(providerContext); - this.extensionActivators = Preconditions.checkNotNull(extensionActivators); + this.providerContext = requireNonNull(providerContext); + this.extensionActivators = requireNonNull(extensionActivators); } public void start() { diff --git a/bgp/concepts/src/main/java/org/opendaylight/bgp/concepts/RouteDistinguisherUtil.java b/bgp/concepts/src/main/java/org/opendaylight/bgp/concepts/RouteDistinguisherUtil.java index 74c60175aa..b5d7d1b634 100644 --- a/bgp/concepts/src/main/java/org/opendaylight/bgp/concepts/RouteDistinguisherUtil.java +++ b/bgp/concepts/src/main/java/org/opendaylight/bgp/concepts/RouteDistinguisherUtil.java @@ -7,6 +7,8 @@ */ package org.opendaylight.bgp.concepts; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; import org.opendaylight.protocol.util.ByteBufWriteUtil; @@ -67,7 +69,7 @@ public final class RouteDistinguisherUtil { * @param byteAggregator */ public static void serializeRouteDistinquisher(final RouteDistinguisher distinguisher, final ByteBuf byteAggregator) { - Preconditions.checkNotNull(distinguisher); + requireNonNull(distinguisher); Preconditions.checkState(byteAggregator != null && byteAggregator.isWritable(RD_LENGTH), "Cannot write Route Distinguisher to provided buffer."); if (distinguisher.getRdTwoOctetAs() != null) { final String[] values = distinguisher.getRdTwoOctetAs().getValue().split(SEPARATOR); diff --git a/bgp/config-loader-impl/src/main/java/org/opendaylight/protocol/bgp/config/loader/impl/ConfigLoaderImpl.java b/bgp/config-loader-impl/src/main/java/org/opendaylight/protocol/bgp/config/loader/impl/ConfigLoaderImpl.java index 8f8117817e..1e08939973 100644 --- a/bgp/config-loader-impl/src/main/java/org/opendaylight/protocol/bgp/config/loader/impl/ConfigLoaderImpl.java +++ b/bgp/config-loader-impl/src/main/java/org/opendaylight/protocol/bgp/config/loader/impl/ConfigLoaderImpl.java @@ -8,7 +8,8 @@ package org.opendaylight.protocol.bgp.config.loader.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -55,10 +56,10 @@ public final class ConfigLoaderImpl implements ConfigLoader, AutoCloseable { public ConfigLoaderImpl(final SchemaContext schemaContext, final BindingNormalizedNodeSerializer bindingSerializer, final String path, final WatchService watchService) { - this.schemaContext = Preconditions.checkNotNull(schemaContext); - this.bindingSerializer = Preconditions.checkNotNull(bindingSerializer); - this.path = Preconditions.checkNotNull(path); - Preconditions.checkNotNull(watchService); + this.schemaContext = requireNonNull(schemaContext); + this.bindingSerializer = requireNonNull(bindingSerializer); + this.path = requireNonNull(path); + requireNonNull(watchService); this.watcherThread = new Thread(new ConfigLoaderImplRunnable(watchService)); this.watcherThread.start(); LOG.info("Config Loader service initiated"); diff --git a/bgp/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EthSegRParser.java b/bgp/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EthSegRParser.java index 0c6d29d20c..3a25eb9eec 100644 --- a/bgp/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EthSegRParser.java +++ b/bgp/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EthSegRParser.java @@ -8,6 +8,7 @@ package org.opendaylight.protocol.bgp.evpn.impl.nlri; +import static java.util.Objects.requireNonNull; import static org.opendaylight.protocol.bgp.evpn.impl.nlri.NlriModelUtil.extractOrigRouteIp; import com.google.common.base.Preconditions; @@ -38,7 +39,7 @@ final class EthSegRParser extends AbstractEvpnNlri { "Wrong length of array of bytes. Passed: %s ;", buffer); final Esi esi = SimpleEsiTypeRegistry.getInstance().parseEsi(buffer.readSlice(ESI_SIZE)); - final IpAddress ip = Preconditions.checkNotNull(parseOrigRouteIp(buffer)); + final IpAddress ip = requireNonNull(parseOrigRouteIp(buffer)); final EsRouteBuilder builder = new EsRouteBuilder().setEsi(esi).setOrigRouteIp(ip); return new EsRouteCaseBuilder().setEsRoute(builder.build()).build(); diff --git a/bgp/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/IncMultEthTagRParser.java b/bgp/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/IncMultEthTagRParser.java index 8e146db68c..adcb480420 100644 --- a/bgp/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/IncMultEthTagRParser.java +++ b/bgp/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/IncMultEthTagRParser.java @@ -8,6 +8,7 @@ package org.opendaylight.protocol.bgp.evpn.impl.nlri; +import static java.util.Objects.requireNonNull; import static org.opendaylight.protocol.bgp.evpn.impl.nlri.NlriModelUtil.extractETI; import static org.opendaylight.protocol.bgp.evpn.impl.nlri.NlriModelUtil.extractOrigRouteIp; @@ -38,7 +39,7 @@ final class IncMultEthTagRParser extends AbstractEvpnNlri { "Wrong length of array of bytes. Passed: %s ;", buffer); final EthernetTagId eti = new EthernetTagIdBuilder().setVlanId(buffer.readUnsignedInt()).build(); - IpAddress ip = Preconditions.checkNotNull(EthSegRParser.parseOrigRouteIp(buffer)); + IpAddress ip = requireNonNull(EthSegRParser.parseOrigRouteIp(buffer)); final IncMultiEthernetTagResBuilder builder = new IncMultiEthernetTagResBuilder().setEthernetTagId(eti).setOrigRouteIp(ip); return new IncMultiEthernetTagResCaseBuilder().setIncMultiEthernetTagRes(builder.build()).build(); } diff --git a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/AbstractFlowspecNlriParser.java b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/AbstractFlowspecNlriParser.java index 72c7a0a433..94c539cb93 100644 --- a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/AbstractFlowspecNlriParser.java +++ b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/AbstractFlowspecNlriParser.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.bgp.flowspec; +import static java.util.Objects.requireNonNull; + import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Joiner; import com.google.common.base.Optional; @@ -150,7 +152,7 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri private static final String FLOW_SEPARATOR = " AND "; protected AbstractFlowspecNlriParser(final SimpleFlowspecTypeRegistry flowspecTypeRegistry) { - this.flowspecTypeRegistry = Preconditions.checkNotNull(flowspecTypeRegistry); + this.flowspecTypeRegistry = requireNonNull(flowspecTypeRegistry); } protected abstract void serializeMpReachNlri(final DestinationType dstType, final ByteBuf byteAggregator); @@ -251,7 +253,7 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri } public final List extractFlowspec(final DataContainerNode route) { - Preconditions.checkNotNull(route, "Cannot extract flowspec from null route."); + requireNonNull(route, "Cannot extract flowspec from null route."); final List fsList = new ArrayList<>(); final Optional> flowspecs = route.getChild(FLOWSPEC_NID); if (flowspecs.isPresent()) { @@ -567,7 +569,7 @@ public abstract class AbstractFlowspecNlriParser implements NlriParser, NlriSeri } public static final int readNlriLength(@Nonnull final ByteBuf nlri) { - Preconditions.checkNotNull(nlri, "NLRI information cannot be null"); + requireNonNull(nlri, "NLRI information cannot be null"); Preconditions.checkState(nlri.isReadable(), "NLRI Byte buffer is not readable."); int length = nlri.readUnsignedByte(); if (length >= MAX_NLRI_LENGTH_ONE_BYTE) { diff --git a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/AbstractFlowspecRIBSupport.java b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/AbstractFlowspecRIBSupport.java index 50cfaee39a..d76c9441a8 100644 --- a/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/AbstractFlowspecRIBSupport.java +++ b/bgp/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/AbstractFlowspecRIBSupport.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.bgp.flowspec; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableCollection; @@ -46,7 +48,7 @@ public abstract class AbstractFlowspecRIBSupport flowspecList = (List) nlriFields[1]; serializeNlri(flowspecList, buffer); @@ -69,7 +69,7 @@ public abstract class AbstractFlowspecL3vpnNlriParser extends AbstractFlowspecNl protected Object[] parseNlri(final ByteBuf nlri) throws BGPParsingException { readNlriLength(nlri); return new Object[] { - Preconditions.checkNotNull(readRouteDistinguisher(nlri)), + requireNonNull(readRouteDistinguisher(nlri)), parseL3vpnNlriFlowspecList(nlri) }; } diff --git a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/spi/pojo/SimpleNlriTypeRegistry.java b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/spi/pojo/SimpleNlriTypeRegistry.java index 65e4445b2d..438553b6a9 100644 --- a/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/spi/pojo/SimpleNlriTypeRegistry.java +++ b/bgp/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/spi/pojo/SimpleNlriTypeRegistry.java @@ -8,6 +8,8 @@ package org.opendaylight.protocol.bgp.linkstate.spi.pojo; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -71,7 +73,7 @@ public final class SimpleNlriTypeRegistry { if (nlri == null) { return; } - Preconditions.checkNotNull(byteAggregator); + requireNonNull(byteAggregator); final ObjectType objectType = nlri.getObjectType(); final NlriTypeCaseSerializer serializer = this.nlriRegistry.getSerializer((Class) objectType.getImplementedInterface()); if (serializer == null) { @@ -122,8 +124,8 @@ public final class SimpleNlriTypeRegistry { if (tlv == null) { return; } - Preconditions.checkNotNull(tlvQName); - Preconditions.checkNotNull(buffer); + requireNonNull(tlvQName); + requireNonNull(buffer); final LinkstateTlvParser.LinkstateTlvSerializer tlvSerializer = (LinkstateTlvParser.LinkstateTlvSerializer) this.tlvSerializers.get(tlvQName); if (tlvSerializer == null) { LOG.warn("Linkstate TLV serializer for QName: {} was not found.", tlvQName); diff --git a/bgp/openconfig-spi/src/main/java/org/opendaylight/protocol/bgp/openconfig/spi/AbstractBGPTableTypeRegistryProviderActivator.java b/bgp/openconfig-spi/src/main/java/org/opendaylight/protocol/bgp/openconfig/spi/AbstractBGPTableTypeRegistryProviderActivator.java index afb79a81f8..8eb1532f7a 100644 --- a/bgp/openconfig-spi/src/main/java/org/opendaylight/protocol/bgp/openconfig/spi/AbstractBGPTableTypeRegistryProviderActivator.java +++ b/bgp/openconfig-spi/src/main/java/org/opendaylight/protocol/bgp/openconfig/spi/AbstractBGPTableTypeRegistryProviderActivator.java @@ -8,6 +8,8 @@ package org.opendaylight.protocol.bgp.openconfig.spi; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import java.util.List; import javax.annotation.concurrent.GuardedBy; @@ -24,7 +26,7 @@ public abstract class AbstractBGPTableTypeRegistryProviderActivator implements A @Override public final synchronized void startBGPTableTypeRegistryProvider(final BGPTableTypeRegistryProvider provider) { Preconditions.checkState(this.registrations == null); - this.registrations = Preconditions.checkNotNull(startBGPTableTypeRegistryProviderImpl(provider)); + this.registrations = requireNonNull(startBGPTableTypeRegistryProviderImpl(provider)); } @Override diff --git a/bgp/openconfig-spi/src/main/java/org/opendaylight/protocol/bgp/openconfig/spi/SimpleBGPTableTypeRegistryProviderActivator.java b/bgp/openconfig-spi/src/main/java/org/opendaylight/protocol/bgp/openconfig/spi/SimpleBGPTableTypeRegistryProviderActivator.java index 4e02769550..368e54882b 100644 --- a/bgp/openconfig-spi/src/main/java/org/opendaylight/protocol/bgp/openconfig/spi/SimpleBGPTableTypeRegistryProviderActivator.java +++ b/bgp/openconfig-spi/src/main/java/org/opendaylight/protocol/bgp/openconfig/spi/SimpleBGPTableTypeRegistryProviderActivator.java @@ -8,6 +8,8 @@ package org.opendaylight.protocol.bgp.openconfig.spi; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import java.util.List; import org.slf4j.Logger; @@ -22,8 +24,8 @@ public final class SimpleBGPTableTypeRegistryProviderActivator implements AutoCl public SimpleBGPTableTypeRegistryProviderActivator(final BGPTableTypeRegistryProvider providerContext, final List extensionActivators) { - this.providerContext = Preconditions.checkNotNull(providerContext); - this.extensionActivators = Preconditions.checkNotNull(extensionActivators); + this.providerContext = requireNonNull(providerContext); + this.extensionActivators = requireNonNull(extensionActivators); } public void start() { diff --git a/bgp/openconfig-state/src/main/java/org/opendaylight/protocol/bgp/state/StateProviderImpl.java b/bgp/openconfig-state/src/main/java/org/opendaylight/protocol/bgp/state/StateProviderImpl.java index b02daa2a84..79b3876def 100644 --- a/bgp/openconfig-state/src/main/java/org/opendaylight/protocol/bgp/state/StateProviderImpl.java +++ b/bgp/openconfig-state/src/main/java/org/opendaylight/protocol/bgp/state/StateProviderImpl.java @@ -8,7 +8,8 @@ package org.opendaylight.protocol.bgp.state; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.ListenableFuture; import io.netty.util.concurrent.GlobalEventExecutor; @@ -81,13 +82,13 @@ public final class StateProviderImpl implements TransactionChainListener, Cluste public StateProviderImpl(@Nonnull final DataBroker dataBroker, final int timeout, @Nonnull BGPTableTypeRegistryConsumer bgpTableTypeRegistry, @Nonnull final BGPStateConsumer stateCollector, @Nonnull final String networkInstanceName, @Nonnull final ClusterSingletonServiceProvider provider) { - this.dataBroker = Preconditions.checkNotNull(dataBroker); - this.bgpTableTypeRegistry = Preconditions.checkNotNull(bgpTableTypeRegistry); - this.stateCollector = Preconditions.checkNotNull(stateCollector); + this.dataBroker = requireNonNull(dataBroker); + this.bgpTableTypeRegistry = requireNonNull(bgpTableTypeRegistry); + this.stateCollector = requireNonNull(stateCollector); this.networkInstanceIId = InstanceIdentifier.create(NetworkInstances.class) .child(NetworkInstance.class, new NetworkInstanceKey(networkInstanceName)); this.timeout = timeout; - this.singletonServiceRegistration = Preconditions.checkNotNull(provider) + this.singletonServiceRegistration = requireNonNull(provider) .registerClusterSingletonService(this); } diff --git a/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/BgpTableTypeImpl.java b/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/BgpTableTypeImpl.java index d47e492410..6e8c45f2a9 100644 --- a/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/BgpTableTypeImpl.java +++ b/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/BgpTableTypeImpl.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.bgp.parser; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + 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.types.rev130919.AddressFamily; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.SubsequentAddressFamily; @@ -28,8 +29,8 @@ public final class BgpTableTypeImpl implements BgpTableType { * @param safi Subsequent Address Family Identifier */ public BgpTableTypeImpl(final Class afi, final Class safi) { - this.afi = Preconditions.checkNotNull(afi, "Address family may not be null"); - this.safi = Preconditions.checkNotNull(safi, "Subsequent address family may not be null"); + this.afi = requireNonNull(afi, "Address family may not be null"); + this.safi = requireNonNull(safi, "Subsequent address family may not be null"); } @Override diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/BGPOpenMessageParser.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/BGPOpenMessageParser.java index 52504b5ce9..cb8d72135b 100644 --- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/BGPOpenMessageParser.java +++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/BGPOpenMessageParser.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.bgp.parser.impl.message; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufUtil; @@ -55,7 +57,7 @@ public final class BGPOpenMessageParser implements MessageParser, MessageSeriali private final ParameterRegistry reg; public BGPOpenMessageParser(final ParameterRegistry reg) { - this.reg = Preconditions.checkNotNull(reg); + this.reg = requireNonNull(reg); } /** diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/BGPRouteRefreshMessageParser.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/BGPRouteRefreshMessageParser.java index 29f1bc6cfb..e70d71c1f1 100644 --- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/BGPRouteRefreshMessageParser.java +++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/BGPRouteRefreshMessageParser.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.bgp.parser.impl.message; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufUtil; @@ -39,8 +41,8 @@ public final class BGPRouteRefreshMessageParser implements MessageParser, Messag private final SubsequentAddressFamilyRegistry safiReg; public BGPRouteRefreshMessageParser(final AddressFamilyRegistry afiReg, final SubsequentAddressFamilyRegistry safiReg) { - this.afiReg = Preconditions.checkNotNull(afiReg); - this.safiReg = Preconditions.checkNotNull(safiReg); + this.afiReg = requireNonNull(afiReg); + this.safiReg = requireNonNull(safiReg); } /** diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/BGPUpdateMessageParser.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/BGPUpdateMessageParser.java index 588e1d72c5..7dce6b979b 100755 --- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/BGPUpdateMessageParser.java +++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/BGPUpdateMessageParser.java @@ -8,6 +8,8 @@ package org.opendaylight.protocol.bgp.parser.impl.message; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -56,7 +58,7 @@ public final class BGPUpdateMessageParser implements MessageParser, MessageSeria private final AttributeRegistry reg; public BGPUpdateMessageParser(final AttributeRegistry reg) { - this.reg = Preconditions.checkNotNull(reg); + this.reg = requireNonNull(reg); } @Override @@ -154,7 +156,7 @@ public final class BGPUpdateMessageParser implements MessageParser, MessageSeria * @throws BGPDocumentedException */ private static void checkMandatoryAttributesPresence(final Update message) throws BGPDocumentedException { - Preconditions.checkNotNull(message, "Update message cannot be null"); + requireNonNull(message, "Update message cannot be null"); final Attributes attrs = message.getAttributes(); diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/AddPathCapabilityHandler.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/AddPathCapabilityHandler.java index ab227edffc..3eaaa03a89 100644 --- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/AddPathCapabilityHandler.java +++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/AddPathCapabilityHandler.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.bgp.parser.impl.message.open; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -40,8 +42,8 @@ public class AddPathCapabilityHandler implements CapabilityParser, CapabilitySer private final SubsequentAddressFamilyRegistry safiReg; public AddPathCapabilityHandler(final AddressFamilyRegistry afiReg, final SubsequentAddressFamilyRegistry safiReg) { - this.afiReg = Preconditions.checkNotNull(afiReg); - this.safiReg = Preconditions.checkNotNull(safiReg); + this.afiReg = requireNonNull(afiReg); + this.safiReg = requireNonNull(safiReg); } @Override diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/CapabilityParameterParser.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/CapabilityParameterParser.java index 32dccd3bbe..a8fee9677b 100644 --- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/CapabilityParameterParser.java +++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/CapabilityParameterParser.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.bgp.parser.impl.message.open; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import io.netty.buffer.ByteBuf; @@ -39,7 +41,7 @@ public final class CapabilityParameterParser implements ParameterParser, Paramet private final CapabilityRegistry reg; public CapabilityParameterParser(final CapabilityRegistry reg) { - this.reg = Preconditions.checkNotNull(reg); + this.reg = requireNonNull(reg); } @Override diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/GracefulCapabilityHandler.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/GracefulCapabilityHandler.java index de6abb4476..b27c11aee7 100644 --- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/GracefulCapabilityHandler.java +++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/GracefulCapabilityHandler.java @@ -7,6 +7,7 @@ */ package org.opendaylight.protocol.bgp.parser.impl.message.open; +import static java.util.Objects.requireNonNull; import static org.opendaylight.protocol.util.ByteBufWriteUtil.writeUnsignedShort; import com.google.common.base.Preconditions; @@ -63,8 +64,8 @@ public final class GracefulCapabilityHandler implements CapabilityParser, Capabi private final SubsequentAddressFamilyRegistry safiReg; public GracefulCapabilityHandler(final AddressFamilyRegistry afiReg, final SubsequentAddressFamilyRegistry safiReg) { - this.afiReg = Preconditions.checkNotNull(afiReg); - this.safiReg = Preconditions.checkNotNull(safiReg); + this.afiReg = requireNonNull(afiReg); + this.safiReg = requireNonNull(safiReg); } private void serializeTables(final List tables, final ByteBuf bytes) { diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/MultiProtocolCapabilityHandler.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/MultiProtocolCapabilityHandler.java index 880593dead..eda0038d31 100644 --- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/MultiProtocolCapabilityHandler.java +++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/MultiProtocolCapabilityHandler.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.bgp.parser.impl.message.open; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import java.util.Optional; @@ -35,8 +36,8 @@ public final class MultiProtocolCapabilityHandler implements CapabilityParser, C private final SubsequentAddressFamilyRegistry safiReg; public MultiProtocolCapabilityHandler(final AddressFamilyRegistry afiReg, final SubsequentAddressFamilyRegistry safiReg) { - this.afiReg = Preconditions.checkNotNull(afiReg); - this.safiReg = Preconditions.checkNotNull(safiReg); + this.afiReg = requireNonNull(afiReg); + this.safiReg = requireNonNull(safiReg); } @Override diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/AggregatorAttributeParser.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/AggregatorAttributeParser.java index 11a84dd515..0a049b54e9 100644 --- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/AggregatorAttributeParser.java +++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/AggregatorAttributeParser.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.bgp.parser.impl.message.update; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -31,7 +33,7 @@ public final class AggregatorAttributeParser implements AttributeParser, Attribu private final ReferenceCache refCache; public AggregatorAttributeParser(final ReferenceCache refCache) { - this.refCache = Preconditions.checkNotNull(refCache); + this.refCache = requireNonNull(refCache); } /** diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/AsPathAttributeParser.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/AsPathAttributeParser.java index c93c0f7e36..b5eee35221 100644 --- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/AsPathAttributeParser.java +++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/AsPathAttributeParser.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.bgp.parser.impl.message.update; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -42,7 +44,7 @@ public final class AsPathAttributeParser implements AttributeParser, AttributeSe private static final AsPath EMPTY = new AsPathBuilder().setSegments(Collections.emptyList()).build(); public AsPathAttributeParser(final ReferenceCache refCache) { - this.refCache = Preconditions.checkNotNull(refCache); + this.refCache = requireNonNull(refCache); } /** diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/BgpPrefixSidAttributeParser.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/BgpPrefixSidAttributeParser.java index 84468742cd..38555ae514 100644 --- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/BgpPrefixSidAttributeParser.java +++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/BgpPrefixSidAttributeParser.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.bgp.parser.impl.message.update; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; import java.util.ArrayList; @@ -32,7 +34,7 @@ public final class BgpPrefixSidAttributeParser implements AttributeParser, Attri private final BgpPrefixSidTlvRegistry reg; public BgpPrefixSidAttributeParser(final BgpPrefixSidTlvRegistry registry) { - this.reg = Preconditions.checkNotNull(registry); + this.reg = requireNonNull(registry); } @Override diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/CommunitiesAttributeParser.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/CommunitiesAttributeParser.java index a23a697756..75b205c5f5 100644 --- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/CommunitiesAttributeParser.java +++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/CommunitiesAttributeParser.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.bgp.parser.impl.message.update; +import static java.util.Objects.requireNonNull; + import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; @@ -42,7 +44,7 @@ public final class CommunitiesAttributeParser implements AttributeParser, Attrib private final ReferenceCache refCache; public CommunitiesAttributeParser(final ReferenceCache refCache) { - this.refCache = Preconditions.checkNotNull(refCache); + this.refCache = requireNonNull(refCache); } @Override diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/CommunityUtil.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/CommunityUtil.java index c37e57b6e5..a245213bb5 100644 --- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/CommunityUtil.java +++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/CommunityUtil.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.bgp.parser.impl.message.update; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import org.opendaylight.protocol.util.NoopReferenceCache; import org.opendaylight.protocol.util.ReferenceCache; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber; @@ -40,7 +41,7 @@ public final class CommunityUtil { private final ReferenceCache refCache; public CommunityUtil(final ReferenceCache refCache) { - this.refCache = Preconditions.checkNotNull(refCache); + this.refCache = requireNonNull(refCache); } /** diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/ExtendedCommunitiesAttributeParser.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/ExtendedCommunitiesAttributeParser.java index 255af83204..8cb386fa1c 100644 --- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/ExtendedCommunitiesAttributeParser.java +++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/ExtendedCommunitiesAttributeParser.java @@ -8,6 +8,8 @@ package org.opendaylight.protocol.bgp.parser.impl.message.update; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -31,7 +33,7 @@ public final class ExtendedCommunitiesAttributeParser implements AttributeParser private final ExtendedCommunityRegistry ecReg; public ExtendedCommunitiesAttributeParser(final ExtendedCommunityRegistry ecReg) { - this.ecReg = Preconditions.checkNotNull(ecReg); + this.ecReg = requireNonNull(ecReg); } @Override diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/MPReachAttributeParser.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/MPReachAttributeParser.java index 6bb57cdd69..e28286e5a7 100644 --- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/MPReachAttributeParser.java +++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/MPReachAttributeParser.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.bgp.parser.impl.message.update; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -34,7 +36,7 @@ public final class MPReachAttributeParser implements AttributeParser, AttributeS private final NlriRegistry reg; public MPReachAttributeParser(final NlriRegistry reg) { - this.reg = Preconditions.checkNotNull(reg); + this.reg = requireNonNull(reg); } @Override diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/MPUnreachAttributeParser.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/MPUnreachAttributeParser.java index 33da3e066a..4a0e637de6 100644 --- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/MPUnreachAttributeParser.java +++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/MPUnreachAttributeParser.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.bgp.parser.impl.message.update; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -32,7 +34,7 @@ public final class MPUnreachAttributeParser implements AttributeParser, Attribut private final NlriRegistry reg; public MPUnreachAttributeParser(final NlriRegistry reg) { - this.reg = Preconditions.checkNotNull(reg); + this.reg = requireNonNull(reg); } @Override diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/AbstractBGPExtensionProviderActivator.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/AbstractBGPExtensionProviderActivator.java index c3a4b9b947..db87debaa4 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/AbstractBGPExtensionProviderActivator.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/AbstractBGPExtensionProviderActivator.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.bgp.parser.spi; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import java.util.List; import javax.annotation.concurrent.GuardedBy; @@ -26,7 +28,7 @@ public abstract class AbstractBGPExtensionProviderActivator implements AutoClose public final synchronized void start(final BGPExtensionProviderContext context) { Preconditions.checkState(this.registrations == null); - this.registrations = Preconditions.checkNotNull(startImpl(context)); + this.registrations = requireNonNull(startImpl(context)); } @Override diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/AbstractMessageRegistry.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/AbstractMessageRegistry.java index e5ff6eff15..37e5e52b58 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/AbstractMessageRegistry.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/AbstractMessageRegistry.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.bgp.parser.spi; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import com.google.common.primitives.UnsignedBytes; import io.netty.buffer.ByteBuf; @@ -67,7 +69,7 @@ public abstract class AbstractMessageRegistry implements MessageRegistry { @Override public final void serializeMessage(final Notification message, final ByteBuf buffer) { - Preconditions.checkNotNull(message, "BGPMessage is mandatory."); + requireNonNull(message, "BGPMessage is mandatory."); serializeMessageImpl(message, buffer); } } diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/MultiPathSupportUtil.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/MultiPathSupportUtil.java index 82571d5c6c..6c58563f35 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/MultiPathSupportUtil.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/MultiPathSupportUtil.java @@ -8,7 +8,8 @@ package org.opendaylight.protocol.bgp.parser.spi; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.util.Optional; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -27,7 +28,7 @@ public final class MultiPathSupportUtil { * @return True if AFI/SAFI is supported. */ public static boolean isTableTypeSupported(@Nullable final PeerSpecificParserConstraint constraints, @Nonnull final BgpTableType afiSafi) { - Preconditions.checkNotNull(afiSafi); + requireNonNull(afiSafi); if (constraints != null) { final Optional peerConstraint = constraints.getPeerConstraint(MultiPathSupport.class); return peerConstraint.isPresent() && peerConstraint.get().isTableTypeSupported(afiSafi); diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/AbstractFamilyRegistry.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/AbstractFamilyRegistry.java index 45f7e0a3d6..5eae3d6f43 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/AbstractFamilyRegistry.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/AbstractFamilyRegistry.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.bgp.parser.spi.pojo; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import java.util.Map; @@ -19,7 +21,7 @@ abstract class AbstractFamilyRegistry { private final Map> numberToClass = new ConcurrentHashMap<>(); protected synchronized AutoCloseable registerFamily(final Class clazz, final N number) { - Preconditions.checkNotNull(clazz); + requireNonNull(clazz); final Class c = this.numberToClass.get(number); Preconditions.checkState(c == null, "Number " + number + " already registered to " + c); diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/MultiPathSupportImpl.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/MultiPathSupportImpl.java index e9ba00b72f..ac9a761c35 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/MultiPathSupportImpl.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/MultiPathSupportImpl.java @@ -8,7 +8,8 @@ package org.opendaylight.protocol.bgp.parser.spi.pojo; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.collect.ImmutableSet; import java.util.List; import java.util.Set; @@ -37,7 +38,7 @@ public final class MultiPathSupportImpl implements MultiPathSupport { * @return MultiPathSupport instance. */ public static MultiPathSupport createParserMultiPathSupport(@Nonnull final List addPathCapabilities) { - Preconditions.checkNotNull(addPathCapabilities); + requireNonNull(addPathCapabilities); final Set support = addPathCapabilities .stream() .filter(e -> e.getSendReceive() == SendReceive.Both || e.getSendReceive() == SendReceive.Send) diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/PeerSpecificParserConstraintImpl.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/PeerSpecificParserConstraintImpl.java index d9c970be22..cdd7ecc4aa 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/PeerSpecificParserConstraintImpl.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/PeerSpecificParserConstraintImpl.java @@ -8,6 +8,8 @@ package org.opendaylight.protocol.bgp.parser.spi.pojo; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import java.util.HashMap; import java.util.Map; @@ -28,8 +30,8 @@ public class PeerSpecificParserConstraintImpl implements PeerSpecificParserConst @Override public synchronized boolean addPeerConstraint(final Class classType, final T peerConstraint) { - Preconditions.checkNotNull(classType); - Preconditions.checkNotNull(peerConstraint); + requireNonNull(classType); + requireNonNull(peerConstraint); final PeerConstraint previous = this.constraints.putIfAbsent(classType, peerConstraint); return previous == null; } diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleAttributeRegistry.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleAttributeRegistry.java index 14fe9809cd..9b7f324607 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleAttributeRegistry.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleAttributeRegistry.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.bgp.parser.spi.pojo; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; import java.util.ArrayList; @@ -45,8 +47,8 @@ final class SimpleAttributeRegistry implements AttributeRegistry { private final ByteBuf buffer; public RawAttribute(final AttributeParser parser, final ByteBuf buffer) { - this.parser = Preconditions.checkNotNull(parser); - this.buffer = Preconditions.checkNotNull(buffer); + this.parser = requireNonNull(parser); + this.buffer = requireNonNull(buffer); } } diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleBGPExtensionProviderContextActivator.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleBGPExtensionProviderContextActivator.java index 13dae6c5c2..c0108eee31 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleBGPExtensionProviderContextActivator.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleBGPExtensionProviderContextActivator.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.bgp.parser.spi.pojo; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.util.List; import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderActivator; import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderContext; @@ -27,8 +28,8 @@ public class SimpleBGPExtensionProviderContextActivator implements AutoCloseable public SimpleBGPExtensionProviderContextActivator(final BGPExtensionProviderContext providerContext, final List extensionActivators) { - this.providerContext = Preconditions.checkNotNull(providerContext); - this.extensionActivators = Preconditions.checkNotNull(extensionActivators); + this.providerContext = requireNonNull(providerContext); + this.extensionActivators = requireNonNull(extensionActivators); } public void start() { diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleNlriRegistry.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleNlriRegistry.java index e566a89bab..be652019e7 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleNlriRegistry.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleNlriRegistry.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.bgp.parser.spi.pojo; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; import io.netty.buffer.ByteBuf; @@ -53,14 +55,14 @@ final class SimpleNlriRegistry implements NlriRegistry { private final AddressFamilyRegistry afiReg; public SimpleNlriRegistry(final AddressFamilyRegistry afiReg, final SubsequentAddressFamilyRegistry safiReg) { - this.afiReg = Preconditions.checkNotNull(afiReg); - this.safiReg = Preconditions.checkNotNull(safiReg); + this.afiReg = requireNonNull(afiReg); + this.safiReg = requireNonNull(safiReg); } private static BgpTableType createKey(final Class afi, final Class safi) { - Preconditions.checkNotNull(afi); - Preconditions.checkNotNull(safi); + requireNonNull(afi); + requireNonNull(safi); return new BgpTableTypeImpl(afi, safi); } diff --git a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/BestPathStateImpl.java b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/BestPathStateImpl.java index 8f3c9470ee..ec6b30902e 100644 --- a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/BestPathStateImpl.java +++ b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/BestPathStateImpl.java @@ -7,10 +7,11 @@ */ package org.opendaylight.protocol.bgp.mode.impl; +import static java.util.Objects.requireNonNull; + import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Optional; -import com.google.common.base.Preconditions; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.common.collect.ImmutableList; @@ -120,7 +121,7 @@ public final class BestPathStateImpl implements BestPathState { throw new IllegalStateException("Error creating namespace-specific attributes collection.", e); } - this.attributes = Preconditions.checkNotNull(attributes); + this.attributes = requireNonNull(attributes); this.ids = col; resolveValues(); } diff --git a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/AddPathBestPath.java b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/AddPathBestPath.java index 42a86d5600..863a90d1de 100644 --- a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/AddPathBestPath.java +++ b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/AddPathBestPath.java @@ -7,8 +7,9 @@ */ package org.opendaylight.protocol.bgp.mode.impl.add; +import static java.util.Objects.requireNonNull; + import com.google.common.base.MoreObjects.ToStringHelper; -import com.google.common.base.Preconditions; import com.google.common.primitives.UnsignedInteger; import javax.annotation.Nonnull; import org.opendaylight.protocol.bgp.mode.api.BestPathState; @@ -23,7 +24,7 @@ public final class AddPathBestPath extends AbstractBestPath { public AddPathBestPath(@Nonnull final BestPathState state, @Nonnull final RouteKey key, final int offsetPosition, final Long pathId) { super(state); - this.routeKey = Preconditions.checkNotNull(key); + this.routeKey = requireNonNull(key); this.offsetPosition = offsetPosition; this.pathId = pathId; } diff --git a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/AddPathSelector.java b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/AddPathSelector.java index 106c642cae..9dbe31b069 100644 --- a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/AddPathSelector.java +++ b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/AddPathSelector.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.bgp.mode.impl.add; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.primitives.UnsignedInteger; import org.opendaylight.protocol.bgp.mode.api.BestPathState; import org.opendaylight.protocol.bgp.mode.impl.BestPathStateImpl; @@ -28,7 +29,7 @@ public final class AddPathSelector extends AbstractBestPathSelector { } void processPath(final ContainerNode attrs, final RouteKey key, final int offsetPosition, final Long pathId) { - Preconditions.checkNotNull(key.getRouteId(), "Router ID may not be null"); + requireNonNull(key.getRouteId(), "Router ID may not be null"); // Consider only non-null attributes if (attrs != null) { diff --git a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/all/paths/AbstractAllPathsRouteEntry.java b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/all/paths/AbstractAllPathsRouteEntry.java index 5f87b9cabe..bba334b246 100644 --- a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/all/paths/AbstractAllPathsRouteEntry.java +++ b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/add/all/paths/AbstractAllPathsRouteEntry.java @@ -8,7 +8,8 @@ package org.opendaylight.protocol.bgp.mode.impl.add.all.paths; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.collect.ImmutableList; import java.util.ArrayList; import java.util.List; @@ -34,7 +35,7 @@ abstract class AbstractAllPathsRouteEntry extends AddPathAbstractRouteEntry { for (final RouteKey key : keyList) { final int offset = this.offsets.offsetOf(key); final ContainerNode attributes = this.offsets.getValue(this.values, offset); - Preconditions.checkNotNull(key.getRouteId(), "Router ID may not be null"); + requireNonNull(key.getRouteId(), "Router ID may not be null"); if (attributes != null) { final BestPathState state = new BestPathStateImpl(attributes); final AddPathBestPath bestPath = new AddPathBestPath(state, key, offset, this.offsets.getValue(this.pathsId, offset)); diff --git a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/BaseBestPath.java b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/BaseBestPath.java index 26bd65796c..a42e4a42ff 100644 --- a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/BaseBestPath.java +++ b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/BaseBestPath.java @@ -7,8 +7,9 @@ */ package org.opendaylight.protocol.bgp.mode.impl.base; +import static java.util.Objects.requireNonNull; + import com.google.common.base.MoreObjects.ToStringHelper; -import com.google.common.base.Preconditions; import com.google.common.primitives.UnsignedInteger; import javax.annotation.Nonnull; import org.opendaylight.protocol.bgp.mode.api.BestPathState; @@ -22,7 +23,7 @@ final class BaseBestPath extends AbstractBestPath { BaseBestPath(@Nonnull final UnsignedInteger routerId, @Nonnull final BestPathState state) { super(state); - this.routerId = Preconditions.checkNotNull(routerId); + this.routerId = requireNonNull(routerId); } @Override diff --git a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/BasePathSelector.java b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/BasePathSelector.java index 52252d3777..a4f62103ed 100644 --- a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/BasePathSelector.java +++ b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/impl/base/BasePathSelector.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.bgp.mode.impl.base; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.primitives.UnsignedInteger; import org.opendaylight.protocol.bgp.mode.api.BestPathState; import org.opendaylight.protocol.bgp.mode.impl.BestPathStateImpl; @@ -26,7 +27,7 @@ final class BasePathSelector extends AbstractBestPathSelector { } void processPath(final UnsignedInteger routerId, final ContainerNode attrs) { - Preconditions.checkNotNull(routerId, "Router ID may not be null"); + requireNonNull(routerId, "Router ID may not be null"); // Consider only non-null attributes if (attrs != null) { diff --git a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/spi/AbstractBestPath.java b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/spi/AbstractBestPath.java index 7780a19f53..b601802444 100644 --- a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/spi/AbstractBestPath.java +++ b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/spi/AbstractBestPath.java @@ -8,9 +8,10 @@ package org.opendaylight.protocol.bgp.mode.spi; +import static java.util.Objects.requireNonNull; + import com.google.common.annotations.VisibleForTesting; import com.google.common.base.MoreObjects; -import com.google.common.base.Preconditions; import org.opendaylight.protocol.bgp.mode.api.BestPath; import org.opendaylight.protocol.bgp.mode.api.BestPathState; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; @@ -19,7 +20,7 @@ public abstract class AbstractBestPath implements BestPath { protected final BestPathState state; protected AbstractBestPath(final BestPathState state) { - this.state = Preconditions.checkNotNull(state); + this.state = requireNonNull(state); } protected abstract MoreObjects.ToStringHelper addToStringAttributes(final MoreObjects.ToStringHelper toStringHelper); diff --git a/bgp/peer-acceptor/src/main/java/org/opendaylight/protocol/bgp/peer/acceptor/BGPPeerAcceptorImpl.java b/bgp/peer-acceptor/src/main/java/org/opendaylight/protocol/bgp/peer/acceptor/BGPPeerAcceptorImpl.java index d7cd1fa867..bce9e0cb99 100644 --- a/bgp/peer-acceptor/src/main/java/org/opendaylight/protocol/bgp/peer/acceptor/BGPPeerAcceptorImpl.java +++ b/bgp/peer-acceptor/src/main/java/org/opendaylight/protocol/bgp/peer/acceptor/BGPPeerAcceptorImpl.java @@ -8,6 +8,8 @@ package org.opendaylight.protocol.bgp.peer.acceptor; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import io.netty.channel.Channel; import io.netty.channel.ChannelConfig; @@ -40,8 +42,8 @@ public final class BGPPeerAcceptorImpl implements AutoCloseable { public BGPPeerAcceptorImpl(final IpAddress bindingAddress, final PortNumber portNumber, final BGPDispatcher bgpDispatcher) { - this.bgpDispatcher = Preconditions.checkNotNull(bgpDispatcher); - this.address = getAddress(Preconditions.checkNotNull(bindingAddress), Preconditions.checkNotNull(portNumber)); + this.bgpDispatcher = requireNonNull(bgpDispatcher); + this.address = getAddress(requireNonNull(bindingAddress), requireNonNull(portNumber)); if (!PlatformDependent.isWindows() && !PlatformDependent.isRoot() && portNumber.getValue() < PRIVILEGED_PORTS) { throw new AccessControlException("Unable to bind port " + portNumber.getValue() + diff --git a/bgp/rib-api/src/main/java/org/opendaylight/protocol/bgp/rib/DefaultRibReference.java b/bgp/rib-api/src/main/java/org/opendaylight/protocol/bgp/rib/DefaultRibReference.java index ad17a12cb5..29d5c6bf60 100644 --- a/bgp/rib-api/src/main/java/org/opendaylight/protocol/bgp/rib/DefaultRibReference.java +++ b/bgp/rib-api/src/main/java/org/opendaylight/protocol/bgp/rib/DefaultRibReference.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.bgp.rib; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.bgp.rib.Rib; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.bgp.rib.RibKey; import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; @@ -19,7 +20,7 @@ public class DefaultRibReference implements RibReference { private final KeyedInstanceIdentifier instanceIdentifier; public DefaultRibReference(final KeyedInstanceIdentifier instanceIdentifier) { - this.instanceIdentifier = Preconditions.checkNotNull(instanceIdentifier); + this.instanceIdentifier = requireNonNull(instanceIdentifier); } @Override diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/AddPathImplModule.java b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/AddPathImplModule.java index 12eee87247..c16055e89f 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/AddPathImplModule.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/AddPathImplModule.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.config.yang.bgp.rib.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import org.opendaylight.controller.config.api.JmxAttributeValidationException; 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.SendReceive; @@ -42,8 +43,8 @@ public final class AddPathImplModule extends AbstractAddPathImplModule { private final SendReceive sendReceiveMode; public AutoCloseableAddPath(final BgpTableType addressFamilyDependency, final SendReceive sendReceive) { - this.family = Preconditions.checkNotNull(addressFamilyDependency); - this.sendReceiveMode = Preconditions.checkNotNull(sendReceive); + this.family = requireNonNull(addressFamilyDependency); + this.sendReceiveMode = requireNonNull(sendReceive); } @Override diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPSMImplModule.java b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPSMImplModule.java index 6347379aae..5792fe3838 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPSMImplModule.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPSMImplModule.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.config.yang.bgp.rib.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import org.opendaylight.controller.config.api.DependencyResolver; import org.opendaylight.controller.config.api.ModuleIdentifier; import org.opendaylight.protocol.bgp.mode.api.PathSelectionMode; @@ -32,8 +33,8 @@ public final class BGPPSMImplModule extends AbstractBGPPSMImplModule { private final PathSelectionMode strategyFactory; AutoCloseableBestPathSelectionStrategy(final BgpTableType pathFamilyDependency, final PathSelectionMode strategyFactory) { - this.pathFamilyDependency = Preconditions.checkNotNull(pathFamilyDependency); - this.strategyFactory = Preconditions.checkNotNull(strategyFactory); + this.pathFamilyDependency = requireNonNull(pathFamilyDependency); + this.strategyFactory = requireNonNull(strategyFactory); } @Override diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPTableTypeImplModule.java b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPTableTypeImplModule.java index d24d1ed62b..77abcbd0a3 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPTableTypeImplModule.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPTableTypeImplModule.java @@ -16,7 +16,8 @@ */ package org.opendaylight.controller.config.yang.bgp.rib.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import org.opendaylight.controller.config.api.JmxAttributeValidationException; 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.types.rev130919.AddressFamily; @@ -56,8 +57,8 @@ public final class BGPTableTypeImplModule extends org.opendaylight.controller.co private final Class safi; public AutoCloseableBgpTableType(final Class afi, final Class safi) { - this.afi = Preconditions.checkNotNull(afi); - this.safi = Preconditions.checkNotNull(safi); + this.afi = requireNonNull(afi); + this.safi = requireNonNull(safi); } @Override diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractBGPSessionNegotiator.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractBGPSessionNegotiator.java index cef181ab08..b76ae3b30e 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractBGPSessionNegotiator.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractBGPSessionNegotiator.java @@ -8,8 +8,9 @@ package org.opendaylight.protocol.bgp.rib.impl; +import static java.util.Objects.requireNonNull; + import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; import io.netty.channel.Channel; import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelHandlerContext; @@ -85,8 +86,8 @@ abstract class AbstractBGPSessionNegotiator extends ChannelInboundHandlerAdapter AbstractBGPSessionNegotiator(final Promise promise, final Channel channel, final BGPPeerRegistry registry) { - this.promise = Preconditions.checkNotNull(promise); - this.channel = Preconditions.checkNotNull(channel); + this.promise = requireNonNull(promise); + this.channel = requireNonNull(channel); this.registry = registry; } diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractReflectingExportPolicy.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractReflectingExportPolicy.java index c6f59ebf9d..ce5a034ec0 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractReflectingExportPolicy.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AbstractReflectingExportPolicy.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.bgp.rib.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import javax.annotation.Nonnull; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.ClusterIdentifier; @@ -22,8 +23,8 @@ abstract class AbstractReflectingExportPolicy extends AbstractExportPolicy { private final Ipv4Address originatorId; protected AbstractReflectingExportPolicy(final Ipv4Address originatorId, final ClusterIdentifier clusterId) { - this.originatorId = Preconditions.checkNotNull(originatorId); - this.clusterId = Preconditions.checkNotNull(clusterId); + this.originatorId = requireNonNull(originatorId); + this.clusterId = requireNonNull(clusterId); } /** diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AdjRibInWriter.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AdjRibInWriter.java index fbe3d38c6a..1cab78d900 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AdjRibInWriter.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AdjRibInWriter.java @@ -7,8 +7,9 @@ */ package org.opendaylight.protocol.bgp.rib.impl; +import static java.util.Objects.requireNonNull; + import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap.Builder; import com.google.common.util.concurrent.FutureCallback; @@ -98,10 +99,10 @@ final class AdjRibInWriter { private AdjRibInWriter(final YangInstanceIdentifier ribPath, final DOMTransactionChain chain, final PeerRole role, final Optional simpleRoutingPolicy, final YangInstanceIdentifier peerPath, final Map tables) { - this.ribPath = Preconditions.checkNotNull(ribPath); - this.chain = Preconditions.checkNotNull(chain); - this.tables = Preconditions.checkNotNull(tables); - this.role = Preconditions.checkNotNull(role); + this.ribPath = requireNonNull(ribPath); + this.chain = requireNonNull(chain); + this.tables = requireNonNull(tables); + this.role = requireNonNull(role); this.simpleRoutingPolicy = simpleRoutingPolicy; this.peerPath = peerPath; } diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AdjRibOutListener.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AdjRibOutListener.java index 6bb66697a1..72ccdebc6d 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AdjRibOutListener.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AdjRibOutListener.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.bgp.rib.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -71,8 +72,8 @@ final class AdjRibOutListener implements ClusteredDOMDataTreeChangeListener, Pre private AdjRibOutListener(final PeerId peerId, final TablesKey tablesKey, final YangInstanceIdentifier ribId, final CodecsRegistry registry, final RIBSupport support, final DOMDataTreeChangeService service, final ChannelOutputLimiter session, final boolean mpSupport, final LongAdder routeCounter) { - this.session = Preconditions.checkNotNull(session); - this.support = Preconditions.checkNotNull(support); + this.session = requireNonNull(session); + this.support = requireNonNull(support); this.codecs = registry.getCodecs(this.support); this.mpSupport = mpSupport; final YangInstanceIdentifier adjRibOutId = ribId.node(Peer.QNAME).node(IdentifierUtils.domPeerId(peerId)).node(AdjRibOut.QNAME).node(Tables.QNAME).node(RibSupportUtils.toYangTablesKey(tablesKey)); diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ApplicationPeer.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ApplicationPeer.java index 45c3c1a2eb..126bd553dc 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ApplicationPeer.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ApplicationPeer.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.bgp.rib.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Verify; import com.google.common.net.InetAddresses; import com.google.common.util.concurrent.Futures; @@ -106,7 +107,7 @@ public class ApplicationPeer extends BGPPeerStateImpl implements org.opendayligh super(rib.getInstanceIdentifier(), "application-peers", new IpAddress(ipAddress), rib.getLocalTablesKeys(), Collections.emptySet()); this.name = applicationRibId.getValue(); - final RIB targetRib = Preconditions.checkNotNull(rib); + final RIB targetRib = requireNonNull(rib); this.rawIdentifier = InetAddresses.forString(ipAddress.getValue()).getAddress(); final NodeIdentifierWithPredicates peerId = IdentifierUtils.domPeerId(RouterIds.createPeerId(ipAddress)); this.peerIId = targetRib.getYangRibId().node(Peer.QNAME).node(peerId); diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPByteToMessageDecoder.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPByteToMessageDecoder.java index afb01154ce..1a6ca0473b 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPByteToMessageDecoder.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPByteToMessageDecoder.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.bgp.rib.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufUtil; import io.netty.channel.ChannelHandlerContext; @@ -32,7 +33,7 @@ final class BGPByteToMessageDecoder extends ByteToMessageDecoder { public BGPByteToMessageDecoder(final MessageRegistry registry) { this.constraints = new PeerSpecificParserConstraintImpl(); - this.registry = Preconditions.checkNotNull(registry); + this.registry = requireNonNull(registry); } public boolean addDecoderConstraint(final Class classType, final T peerConstraint) { diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPDispatcherImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPDispatcherImpl.java index 88c780a2bb..bdd01e37d2 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPDispatcherImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPDispatcherImpl.java @@ -7,8 +7,9 @@ */ package org.opendaylight.protocol.bgp.rib.impl; +import static java.util.Objects.requireNonNull; + import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; import io.netty.bootstrap.Bootstrap; import io.netty.bootstrap.ServerBootstrap; import io.netty.buffer.PooledByteBufAllocator; @@ -66,10 +67,10 @@ public class BGPDispatcherImpl implements BGPDispatcher, AutoCloseable { this.bossGroup = new EpollEventLoopGroup(); this.workerGroup = new EpollEventLoopGroup(); } else { - this.bossGroup = Preconditions.checkNotNull(bossGroup); - this.workerGroup = Preconditions.checkNotNull(workerGroup); + this.bossGroup = requireNonNull(bossGroup); + this.workerGroup = requireNonNull(workerGroup); } - this.bgpPeerRegistry = Preconditions.checkNotNull(bgpPeerRegistry); + this.bgpPeerRegistry = requireNonNull(bgpPeerRegistry); this.handlerFactory = new BGPHandlerFactory(messageRegistry); } diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPHandlerFactory.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPHandlerFactory.java index a59033a895..1e01b0956c 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPHandlerFactory.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPHandlerFactory.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.bgp.rib.impl; -import com.google.common.base.Preconditions; + +import static java.util.Objects.requireNonNull; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelOutboundHandler; @@ -22,7 +23,7 @@ public class BGPHandlerFactory { private final MessageRegistry registry; public BGPHandlerFactory(final MessageRegistry registry) { - this.registry = Preconditions.checkNotNull(registry); + this.registry = requireNonNull(registry); this.encoder = new BGPMessageToByteEncoder(registry); } diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPMessageToByteEncoder.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPMessageToByteEncoder.java index 7d576920e5..58c35513e2 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPMessageToByteEncoder.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPMessageToByteEncoder.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.bgp.rib.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufUtil; import io.netty.channel.ChannelHandler.Sharable; @@ -27,7 +28,7 @@ final class BGPMessageToByteEncoder extends MessageToByteEncoder { private final MessageRegistry registry; BGPMessageToByteEncoder(final MessageRegistry registry) { - this.registry = Preconditions.checkNotNull(registry); + this.registry = requireNonNull(registry); } @Override diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java index 0f6696b914..a131ec00d8 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java @@ -7,12 +7,12 @@ */ package org.opendaylight.protocol.bgp.rib.impl; +import static java.util.Objects.requireNonNull; import static org.opendaylight.protocol.bgp.rib.impl.AdjRibInWriter.isAnnounceNone; import static org.opendaylight.protocol.bgp.rib.impl.AdjRibInWriter.isLearnNone; import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects.ToStringHelper; -import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.net.InetAddresses; import com.google.common.util.concurrent.Futures; @@ -144,7 +144,7 @@ public class BGPPeer extends BGPPeerStateImpl implements BGPSessionListener, Pee afiSafisGracefulAdvertized); this.peerRole = role; this.simpleRoutingPolicy = Optional.ofNullable(peerStatus); - this.rib = Preconditions.checkNotNull(rib); + this.rib = requireNonNull(rib); this.name = name; this.rpcRegistry = rpcRegistry; this.peerStats = new BGPPeerStatsImpl(this.name, this.tables, this); diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionImpl.java index 43ba857b83..9e8b31760e 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionImpl.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.bgp.rib.impl; +import static java.util.Objects.requireNonNull; + import com.google.common.annotations.VisibleForTesting; import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects.ToStringHelper; @@ -131,8 +133,8 @@ public class BGPSessionImpl extends SimpleChannelInboundHandler im public BGPSessionImpl(final BGPSessionListener listener, final Channel channel, final Open remoteOpen, final int localHoldTimer, final BGPPeerRegistry peerRegistry) { - this.listener = Preconditions.checkNotNull(listener); - this.channel = Preconditions.checkNotNull(channel); + this.listener = requireNonNull(listener); + this.channel = requireNonNull(channel); this.limiter = new ChannelOutputLimiter(this); this.channel.pipeline().addLast(this.limiter); this.holdTimerValue = (remoteOpen.getHoldTimer() < localHoldTimer) ? remoteOpen.getHoldTimer() : localHoldTimer; diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSynchronization.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSynchronization.java index 279b91dbc6..5e13956fc1 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSynchronization.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPSynchronization.java @@ -7,8 +7,9 @@ */ package org.opendaylight.protocol.bgp.rib.impl; +import static java.util.Objects.requireNonNull; + import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import java.util.Map; import java.util.Map.Entry; @@ -61,7 +62,7 @@ public class BGPSynchronization { private final BGPSessionListener listener; public BGPSynchronization(final BGPSessionListener listener, final Set types) { - this.listener = Preconditions.checkNotNull(listener); + this.listener = requireNonNull(listener); for (final TablesKey type : types) { this.syncStorage.put(type, new SyncVariables()); diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BgpPeerRpc.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BgpPeerRpc.java index 7caa0faccb..9598a14abb 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BgpPeerRpc.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BgpPeerRpc.java @@ -7,8 +7,9 @@ */ package org.opendaylight.protocol.bgp.rib.impl; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Function; -import com.google.common.base.Preconditions; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.JdkFutureAdapters; import com.google.common.util.concurrent.MoreExecutors; @@ -36,8 +37,8 @@ public class BgpPeerRpc implements BgpPeerRpcService { private final Set supportedFamilies; BgpPeerRpc(final BGPSession session, final Set supportedFamilies) { - this.session = Preconditions.checkNotNull(session); - this.supportedFamilies = Preconditions.checkNotNull(supportedFamilies); + this.session = requireNonNull(session); + this.supportedFamilies = requireNonNull(supportedFamilies); } @Override diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/CachingImportPolicy.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/CachingImportPolicy.java index 4fd885ac7f..db2082b107 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/CachingImportPolicy.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/CachingImportPolicy.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.bgp.rib.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.collect.Interner; import com.google.common.collect.Interners; import com.google.common.collect.MapMaker; @@ -49,7 +50,7 @@ final class CachingImportPolicy extends AbstractImportPolicy { private final AbstractImportPolicy delegate; CachingImportPolicy(final AbstractImportPolicy delegate) { - this.delegate = Preconditions.checkNotNull(delegate); + this.delegate = requireNonNull(delegate); } @Nonnull private static ContainerNode maskNull(@Nullable final ContainerNode unmasked) { diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ChannelOutputLimiter.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ChannelOutputLimiter.java index ca818341b7..76d161d957 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ChannelOutputLimiter.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ChannelOutputLimiter.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.bgp.rib.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; @@ -27,7 +28,7 @@ public final class ChannelOutputLimiter extends ChannelInboundHandlerAdapter { private volatile boolean blocked; ChannelOutputLimiter(final BGPSessionImpl session) { - this.session = Preconditions.checkNotNull(session); + this.session = requireNonNull(session); } private void ensureWritable() { diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/CodecsImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/CodecsImpl.java index 9ea28febcd..e1b72b8c82 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/CodecsImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/CodecsImpl.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.bgp.rib.impl; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet.Builder; @@ -90,7 +92,7 @@ public final class CodecsImpl implements Codecs { private final RIBSupport ribSupport; public CodecsImpl(final RIBSupport ribSupport) { - this.ribSupport = Preconditions.checkNotNull(ribSupport); + this.ribSupport = requireNonNull(ribSupport); final Builder> acb = ImmutableSet.builder(); acb.addAll(ATTRIBUTE_CACHEABLES); acb.addAll(this.ribSupport.cacheableAttributeObjects()); diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/CodecsRegistryImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/CodecsRegistryImpl.java index 0816ecddfa..57ed866ec7 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/CodecsRegistryImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/CodecsRegistryImpl.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.bgp.rib.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; @@ -39,8 +40,8 @@ final class CodecsRegistryImpl implements CodecsRegistry { private volatile BindingCodecTree latestCodecTree; private CodecsRegistryImpl(final BindingCodecTreeFactory codecFactory, final GeneratedClassLoadingStrategy strategy) { - this.codecFactory = Preconditions.checkNotNull(codecFactory); - this.classContext = Preconditions.checkNotNull(strategy); + this.codecFactory = requireNonNull(codecFactory); + this.classContext = requireNonNull(strategy); } static CodecsRegistryImpl create(final BindingCodecTreeFactory codecFactory, final GeneratedClassLoadingStrategy classStrategy) { diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/EffectiveRibInWriter.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/EffectiveRibInWriter.java index 148fc74479..797bf62627 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/EffectiveRibInWriter.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/EffectiveRibInWriter.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.bgp.rib.impl; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.base.Verify; @@ -90,11 +92,11 @@ final class EffectiveRibInWriter implements PrefixesReceivedCounters, PrefixesIn AdjInTracker(final DOMDataTreeChangeService service, final RIBSupportContextRegistry registry, final DOMTransactionChain chain, final YangInstanceIdentifier peerIId, @Nonnull final PerTableTypeRouteCounter adjRibInRouteCounters, @Nonnull Set tables) { - this.registry = Preconditions.checkNotNull(registry); - this.chain = Preconditions.checkNotNull(chain); - this.peerIId = Preconditions.checkNotNull(peerIId); + this.registry = requireNonNull(registry); + this.chain = requireNonNull(chain); + this.peerIId = requireNonNull(peerIId); this.effRibTables = this.peerIId.node(EffectiveRibIn.QNAME).node(Tables.QNAME); - this.adjRibInRouteCounters = Preconditions.checkNotNull(adjRibInRouteCounters); + this.adjRibInRouteCounters = requireNonNull(adjRibInRouteCounters); this.prefixesInstalled = buildPrefixesTables(tables); this.prefixesReceived = buildPrefixesTables(tables); diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ExportPolicyPeerTrackerImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ExportPolicyPeerTrackerImpl.java index 0f567dd02d..3beb602675 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ExportPolicyPeerTrackerImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ExportPolicyPeerTrackerImpl.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.bgp.rib.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.util.EnumMap; import java.util.HashMap; import java.util.Map; @@ -52,7 +53,7 @@ final class ExportPolicyPeerTrackerImpl implements ExportPolicyPeerTracker { private final Map groups = new EnumMap<>(PeerRole.class); ExportPolicyPeerTrackerImpl(final PolicyDatabase policyDatabase, final TablesKey localTablesKey) { - this.policyDatabase = Preconditions.checkNotNull(policyDatabase); + this.policyDatabase = requireNonNull(policyDatabase); this.localTableKey = localTablesKey; } @@ -110,7 +111,7 @@ final class ExportPolicyPeerTrackerImpl implements ExportPolicyPeerTracker { @Override public synchronized PeerExportGroup getPeerGroup(final PeerRole role) { - return this.groups.get(Preconditions.checkNotNull(role)); + return this.groups.get(requireNonNull(role)); } @Override diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/FromInternalImportPolicy.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/FromInternalImportPolicy.java index 89bb226f3a..a078dac4a7 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/FromInternalImportPolicy.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/FromInternalImportPolicy.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.bgp.rib.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import org.opendaylight.protocol.bgp.rib.impl.spi.AbstractImportPolicy; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.ClusterIdentifier; @@ -26,8 +27,8 @@ class FromInternalImportPolicy extends AbstractImportPolicy { private final Ipv4Address bgpIdentifier; FromInternalImportPolicy(final Ipv4Address bgpIdentifier, final ClusterIdentifier clusterIdentifier) { - this.bgpIdentifier = Preconditions.checkNotNull(bgpIdentifier); - this.clusterIdentifier = Preconditions.checkNotNull(clusterIdentifier); + this.bgpIdentifier = requireNonNull(bgpIdentifier); + this.clusterIdentifier = requireNonNull(clusterIdentifier); } @Override diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ImportPolicyPeerTrackerImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ImportPolicyPeerTrackerImpl.java index d1cf0cb2f6..aad71be1b4 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ImportPolicyPeerTrackerImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ImportPolicyPeerTrackerImpl.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.bgp.rib.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.opendaylight.protocol.bgp.rib.impl.spi.AbstractImportPolicy; @@ -28,7 +29,7 @@ final class ImportPolicyPeerTrackerImpl implements ImportPolicyPeerTracker { protected ImportPolicyPeerTrackerImpl(final PolicyDatabase policyDatabase) { super(); - this.policyDatabase = Preconditions.checkNotNull(policyDatabase); + this.policyDatabase = requireNonNull(policyDatabase); } @Override diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/LocRibWriter.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/LocRibWriter.java index 3fcd3ab39a..1645b655be 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/LocRibWriter.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/LocRibWriter.java @@ -7,8 +7,9 @@ */ package org.opendaylight.protocol.bgp.rib.impl; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Optional; -import com.google.common.base.Preconditions; import com.google.common.primitives.UnsignedInteger; import java.util.Collection; import java.util.HashMap; @@ -86,14 +87,14 @@ final class LocRibWriter implements AutoCloseable, TotalPrefixesCounter, TotalPa final YangInstanceIdentifier target, final Long ourAs, final DOMDataTreeChangeService service, final ExportPolicyPeerTracker exportPolicyPeerTracker, final TablesKey tablesKey, final PathSelectionMode pathSelectionMode) { - this.chain = Preconditions.checkNotNull(chain); - this.target = Preconditions.checkNotNull(target); + this.chain = requireNonNull(chain); + this.target = requireNonNull(target); this.tableKey = RibSupportUtils.toYangTablesKey(tablesKey); this.localTablesKey = tablesKey; this.locRibTarget = YangInstanceIdentifier.create(target.node(LocRib.QNAME).node(Tables.QNAME) .node(this.tableKey).getPathArguments()); - this.ourAs = Preconditions.checkNotNull(ourAs); - this.service = Preconditions.checkNotNull(service); + this.ourAs = requireNonNull(ourAs); + this.service = requireNonNull(service); this.ribSupport = registry.getRIBSupportContext(tablesKey).getRibSupport(); this.attributesIdentifier = this.ribSupport.routeAttributesIdentifier(); this.exportPolicyPeerTracker = exportPolicyPeerTracker; @@ -129,7 +130,7 @@ final class LocRibWriter implements AutoCloseable, TotalPrefixesCounter, TotalPa * @param newChain new transaction chain */ synchronized void restart(@Nonnull final DOMTransactionChain newChain) { - Preconditions.checkNotNull(newChain); + requireNonNull(newChain); close(); this.chain = newChain; init(); diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/PeerExportGroupImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/PeerExportGroupImpl.java index 6388547642..37f27ecd3c 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/PeerExportGroupImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/PeerExportGroupImpl.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.bgp.rib.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.util.HashMap; import java.util.Map; import java.util.function.BiConsumer; @@ -25,7 +26,7 @@ final class PeerExportGroupImpl implements PeerExportGroupRegistry { private final AbstractExportPolicy policy; public PeerExportGroupImpl(final AbstractExportPolicy policy) { - this.policy = Preconditions.checkNotNull(policy); + this.policy = requireNonNull(policy); } @Override diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ProtocolsConfigFileProcessor.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ProtocolsConfigFileProcessor.java index 62e73cba17..65431f5790 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ProtocolsConfigFileProcessor.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ProtocolsConfigFileProcessor.java @@ -8,7 +8,8 @@ package org.opendaylight.protocol.bgp.rib.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.util.Collection; import java.util.List; import java.util.Map; @@ -47,8 +48,8 @@ public final class ProtocolsConfigFileProcessor implements ConfigFileProcessor, private static final SchemaPath PROTOCOLS_SCHEMA_PATH = SchemaPath.create(true, NetworkInstances.QNAME, NetworkInstance.QNAME, Protocols.QNAME); public ProtocolsConfigFileProcessor(final ConfigLoader configLoader, final BgpDeployer bgpDeployer) { - Preconditions.checkNotNull(configLoader); - this.bgpDeployer = Preconditions.checkNotNull(bgpDeployer); + requireNonNull(configLoader); + this.bgpDeployer = requireNonNull(bgpDeployer); this.protocolsIID = this.bgpDeployer.getInstanceIdentifier().child(Protocols.class); this.bindingSerializer = configLoader.getBindingNormalizedNodeSerializer(); this.protocolYIId = this.bindingSerializer.toYangInstanceIdentifier(this.protocolsIID.child(Protocol.class)); diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBImpl.java index d9fea9c8c0..2ac879efd8 100755 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBImpl.java @@ -7,9 +7,10 @@ */ package org.opendaylight.protocol.bgp.rib.impl; +import static java.util.Objects.requireNonNull; + import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects.ToStringHelper; -import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.CheckedFuture; @@ -124,27 +125,27 @@ public final class RIBImpl extends BGPRIBStateImpl implements ClusterSingletonSe final BindingCodecTreeFactory codecFactory, final DOMDataBroker domDataBroker, final List localTables, @Nonnull final Map bestPathSelectionStrategies, final GeneratedClassLoadingStrategy classStrategy, final BgpDeployer.WriteConfiguration configurationWriter) { - super(InstanceIdentifier.create(BgpRib.class).child(Rib.class, new RibKey(Preconditions.checkNotNull(ribId))), + super(InstanceIdentifier.create(BgpRib.class).child(Rib.class, new RibKey(requireNonNull(ribId))), localBgpId, localAs); - this.localAs = Preconditions.checkNotNull(localAs); - this.bgpIdentifier = Preconditions.checkNotNull(localBgpId); - this.dispatcher = Preconditions.checkNotNull(dispatcher); + this.localAs = requireNonNull(localAs); + this.bgpIdentifier = requireNonNull(localBgpId); + this.dispatcher = requireNonNull(dispatcher); this.localTables = ImmutableSet.copyOf(localTables); this.localTablesKeys = new HashSet<>(); - this.domDataBroker = Preconditions.checkNotNull(domDataBroker); + this.domDataBroker = requireNonNull(domDataBroker); this.service = this.domDataBroker.getSupportedExtensions().get(DOMDataTreeChangeService.class); - this.extensions = Preconditions.checkNotNull(extensions); + this.extensions = requireNonNull(extensions); this.codecsRegistry = CodecsRegistryImpl.create(codecFactory, classStrategy); this.ribContextRegistry = RIBSupportContextRegistryImpl.create(extensions, this.codecsRegistry); final InstanceIdentifierBuilder yangRibIdBuilder = YangInstanceIdentifier.builder().node(BgpRib.QNAME).node(Rib.QNAME); this.yangRibId = yangRibIdBuilder.nodeWithKey(Rib.QNAME, RIB_ID_QNAME, ribId.getValue()).build(); - this.bestPathSelectionStrategies = Preconditions.checkNotNull(bestPathSelectionStrategies); + this.bestPathSelectionStrategies = requireNonNull(bestPathSelectionStrategies); final ClusterIdentifier cId = clusterId == null ? new ClusterIdentifier(localBgpId) : clusterId; this.ribId = ribId; final PolicyDatabase policyDatabase = new PolicyDatabase(this.localAs.getValue(), localBgpId, cId); this.importPolicyPeerTracker = new ImportPolicyPeerTrackerImpl(policyDatabase); this.serviceGroupIdentifier = ServiceGroupIdentifier.create(this.ribId.getValue() + "-service-group"); - Preconditions.checkNotNull(provider, "ClusterSingletonServiceProvider is null"); + requireNonNull(provider, "ClusterSingletonServiceProvider is null"); this.provider = provider; this.configurationWriter = configurationWriter; diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBSupportContextImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBSupportContextImpl.java index edff5a1bfe..e70da186ab 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBSupportContextImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBSupportContextImpl.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.bgp.rib.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Verify; import java.util.Map.Entry; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; @@ -37,7 +38,7 @@ class RIBSupportContextImpl extends RIBSupportContext { private final Codecs codecs; public RIBSupportContextImpl(final RIBSupport ribSupport, final CodecsRegistry codecs) { - this.ribSupport = Preconditions.checkNotNull(ribSupport); + this.ribSupport = requireNonNull(ribSupport); this.codecs = codecs.getCodecs(this.ribSupport); } diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBSupportContextRegistryImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBSupportContextRegistryImpl.java index e0abb2991c..a7110cf42f 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBSupportContextRegistryImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBSupportContextRegistryImpl.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.bgp.rib.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; @@ -33,8 +34,8 @@ final class RIBSupportContextRegistryImpl implements RIBSupportContextRegistry { private final CodecsRegistry codecs; private RIBSupportContextRegistryImpl(final RIBExtensionConsumerContext extensions, final CodecsRegistry codecs) { - this.extensionContext = Preconditions.checkNotNull(extensions); - this.codecs = Preconditions.checkNotNull(codecs); + this.extensionContext = requireNonNull(extensions); + this.codecs = requireNonNull(codecs); } static RIBSupportContextRegistryImpl create(final RIBExtensionConsumerContext extensions, final CodecsRegistry codecs) { diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RouteUpdateKey.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RouteUpdateKey.java index 7b6da1c296..766605fab4 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RouteUpdateKey.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RouteUpdateKey.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.bgp.rib.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.PeerId; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; @@ -20,8 +21,8 @@ final class RouteUpdateKey { private final PathArgument routeId; RouteUpdateKey(final PeerId peerId, final PathArgument routeId) { - this.peerId = Preconditions.checkNotNull(peerId); - this.routeId = Preconditions.checkNotNull(routeId); + this.peerId = requireNonNull(peerId); + this.routeId = requireNonNull(routeId); } PeerId getPeerId() { diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistry.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistry.java index 18161d6309..61bf91ed65 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistry.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistry.java @@ -8,6 +8,8 @@ package org.opendaylight.protocol.bgp.rib.impl; +import static java.util.Objects.requireNonNull; + import com.google.common.base.MoreObjects; import com.google.common.base.Optional; import com.google.common.base.Preconditions; @@ -81,13 +83,13 @@ public final class StrictBGPPeerRegistry implements BGPPeerRegistry { @Override public synchronized void addPeer(final IpAddress ip, final BGPSessionListener peer, final BGPSessionPreferences preferences) { - Preconditions.checkNotNull(ip); + requireNonNull(ip); Preconditions.checkArgument(!this.peers.containsKey(ip), "Peer for %s already present", ip); - this.peers.put(ip, Preconditions.checkNotNull(peer)); - Preconditions.checkNotNull(preferences.getMyAs()); - Preconditions.checkNotNull(preferences.getHoldTime()); - Preconditions.checkNotNull(preferences.getParams()); - Preconditions.checkNotNull(preferences.getBgpId()); + this.peers.put(ip, requireNonNull(peer)); + requireNonNull(preferences.getMyAs()); + requireNonNull(preferences.getHoldTime()); + requireNonNull(preferences.getParams()); + requireNonNull(preferences.getBgpId()); this.peerPreferences.put(ip, preferences); for (final PeerRegistryListener peerRegistryListener : this.listeners) { peerRegistryListener.onPeerAdded(ip, preferences); @@ -96,7 +98,7 @@ public final class StrictBGPPeerRegistry implements BGPPeerRegistry { @Override public synchronized void removePeer(final IpAddress ip) { - Preconditions.checkNotNull(ip); + requireNonNull(ip); this.peers.remove(ip); for (final PeerRegistryListener peerRegistryListener : this.listeners) { peerRegistryListener.onPeerRemoved(ip); @@ -105,7 +107,7 @@ public final class StrictBGPPeerRegistry implements BGPPeerRegistry { @Override public synchronized void removePeerSession(final IpAddress ip) { - Preconditions.checkNotNull(ip); + requireNonNull(ip); this.sessionIds.remove(ip); for (final PeerRegistrySessionListener peerRegistrySessionListener : this.sessionListeners) { peerRegistrySessionListener.onSessionRemoved(ip); @@ -114,7 +116,7 @@ public final class StrictBGPPeerRegistry implements BGPPeerRegistry { @Override public boolean isPeerConfigured(final IpAddress ip) { - Preconditions.checkNotNull(ip); + requireNonNull(ip); return this.peers.containsKey(ip); } @@ -125,11 +127,11 @@ public final class StrictBGPPeerRegistry implements BGPPeerRegistry { @Override public synchronized BGPSessionListener getPeer(final IpAddress ip, final Ipv4Address sourceId, final Ipv4Address remoteId, final Open openObj) throws BGPDocumentedException { - Preconditions.checkNotNull(ip); - Preconditions.checkNotNull(sourceId); - Preconditions.checkNotNull(remoteId); + requireNonNull(ip); + requireNonNull(sourceId); + requireNonNull(remoteId); final AsNumber remoteAsNumber = AsNumberUtil.advertizedAsNumber(openObj); - Preconditions.checkNotNull(remoteAsNumber); + requireNonNull(remoteAsNumber); final BGPSessionPreferences prefs = getPeerPreferences(ip); @@ -231,7 +233,7 @@ public final class StrictBGPPeerRegistry implements BGPPeerRegistry { @Override public BGPSessionPreferences getPeerPreferences(final IpAddress ip) { - Preconditions.checkNotNull(ip); + requireNonNull(ip); checkPeerConfigured(ip); return this.peerPreferences.get(ip); } @@ -244,7 +246,7 @@ public final class StrictBGPPeerRegistry implements BGPPeerRegistry { * @throws IllegalArgumentException if submitted socket address is not InetSocketAddress[ipv4 | ipv6] */ public static IpAddress getIpAddress(final SocketAddress socketAddress) { - Preconditions.checkNotNull(socketAddress); + requireNonNull(socketAddress); Preconditions.checkArgument(socketAddress instanceof InetSocketAddress, "Expecting InetSocketAddress but was %s", socketAddress.getClass()); final InetAddress inetAddress = ((InetSocketAddress) socketAddress).getAddress(); @@ -275,9 +277,9 @@ public final class StrictBGPPeerRegistry implements BGPPeerRegistry { private final AsNumber asNumber; BGPSessionId(final Ipv4Address from, final Ipv4Address to, final AsNumber asNumber) { - this.from = Preconditions.checkNotNull(from); - this.to = Preconditions.checkNotNull(to); - this.asNumber = Preconditions.checkNotNull(asNumber); + this.from = requireNonNull(from); + this.to = requireNonNull(to); + this.asNumber = requireNonNull(asNumber); } /** diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/TableContext.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/TableContext.java index e90be4620a..50a092955c 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/TableContext.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/TableContext.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.bgp.rib.impl; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import javax.annotation.concurrent.NotThreadSafe; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; @@ -28,8 +30,8 @@ final class TableContext { private final RIBSupportContext tableSupport; TableContext(final RIBSupportContext tableSupport, final YangInstanceIdentifier tableId) { - this.tableSupport = Preconditions.checkNotNull(tableSupport); - this.tableId = Preconditions.checkNotNull(tableId); + this.tableSupport = requireNonNull(tableSupport); + this.tableId = requireNonNull(tableId); } YangInstanceIdentifier getTableId() { diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ToExternalExportPolicy.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ToExternalExportPolicy.java index a5cf30e49b..d52c15d7c1 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ToExternalExportPolicy.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/ToExternalExportPolicy.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.bgp.rib.impl; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.PeerRole; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; @@ -18,7 +20,7 @@ final class ToExternalExportPolicy extends AbstractExportPolicy { private final Long localAs; ToExternalExportPolicy(final Long localAs) { - this.localAs = Preconditions.checkNotNull(localAs); + this.localAs = requireNonNull(localAs); } @Override diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpDeployerImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpDeployerImpl.java index 9a099b6fc1..e3c5b29ab0 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpDeployerImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpDeployerImpl.java @@ -9,11 +9,11 @@ package org.opendaylight.protocol.bgp.rib.impl.config; import static com.google.common.util.concurrent.Futures.transform; +import static java.util.Objects.requireNonNull; import static org.opendaylight.protocol.bgp.rib.impl.config.OpenConfigMappingUtil.getNeighborInstanceIdentifier; import static org.opendaylight.protocol.bgp.rib.impl.config.OpenConfigMappingUtil.getNeighborInstanceName; import static org.opendaylight.protocol.bgp.rib.impl.config.OpenConfigMappingUtil.getRibInstanceName; -import com.google.common.base.Preconditions; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -76,10 +76,10 @@ public final class BgpDeployerImpl implements BgpDeployer, ClusteredDataTreeChan public BgpDeployerImpl(final String networkInstanceName, final BlueprintContainer container, final BundleContext bundleContext, final DataBroker dataBroker, final BGPTableTypeRegistryConsumer mappingService) { - this.dataBroker = Preconditions.checkNotNull(dataBroker); - this.container = Preconditions.checkNotNull(container); - this.bundleContext = Preconditions.checkNotNull(bundleContext); - this.tableTypeRegistry = Preconditions.checkNotNull(mappingService); + this.dataBroker = requireNonNull(dataBroker); + this.container = requireNonNull(container); + this.bundleContext = requireNonNull(bundleContext); + this.tableTypeRegistry = requireNonNull(mappingService); this.networkInstanceIId = InstanceIdentifier.create(NetworkInstances.class) .child(NetworkInstance.class, new NetworkInstanceKey(networkInstanceName)); Futures.addCallback(initializeNetworkInstance(dataBroker, this.networkInstanceIId), new FutureCallback() { diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeer.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeer.java index 369bc13b88..5c888ca474 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeer.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeer.java @@ -8,6 +8,7 @@ package org.opendaylight.protocol.bgp.rib.impl.config; +import static java.util.Objects.requireNonNull; import static org.opendaylight.protocol.bgp.rib.impl.config.OpenConfigMappingUtil.getHoldTimer; import static org.opendaylight.protocol.bgp.rib.impl.config.OpenConfigMappingUtil.getPeerAs; import static org.opendaylight.protocol.bgp.rib.impl.config.OpenConfigMappingUtil.getSimpleRoutingPolicy; @@ -233,7 +234,7 @@ public final class BgpPeer implements PeerBean, BGPPeerStateConsumer, BGPPeerRun private BgpPeerSingletonService(final RIB rib, final Neighbor neighbor, final BGPTableTypeRegistryConsumer tableTypeRegistry, final WriteConfiguration configurationWriter) { this.neighborAddress = neighbor.getNeighborAddress(); - final AfiSafis afisSAfis = Preconditions.checkNotNull(neighbor.getAfiSafis()); + final AfiSafis afisSAfis = requireNonNull(neighbor.getAfiSafis()); final Set afiSafisAdvertized = OpenConfigMappingUtil .toTableKey(afisSAfis.getAfiSafi(), tableTypeRegistry); this.bgpPeer = new BGPPeer(Ipv4Util.toStringIP(this.neighborAddress), rib, diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImpl.java index c341acebad..8536f6b3c0 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImpl.java @@ -8,6 +8,7 @@ package org.opendaylight.protocol.bgp.rib.impl.config; +import static java.util.Objects.requireNonNull; import static org.opendaylight.protocol.bgp.rib.impl.config.OpenConfigMappingUtil.getAfiSafiWithDefault; import static org.opendaylight.protocol.bgp.rib.impl.config.OpenConfigMappingUtil.getClusterIdentifier; import static org.opendaylight.protocol.bgp.rib.impl.config.OpenConfigMappingUtil.toTableTypes; @@ -85,7 +86,7 @@ public final class RibImpl implements RIB, BGPRIBStateConsumer, AutoCloseable { public RibImpl(final ClusterSingletonServiceProvider provider, final RIBExtensionConsumerContext contextProvider, final BGPDispatcher dispatcher, final BindingCodecTreeFactory codecTreeFactory, final DOMDataBroker domBroker, final DOMSchemaService domSchemaService) { - this.provider = Preconditions.checkNotNull(provider); + this.provider = requireNonNull(provider); this.extensions = contextProvider; this.dispatcher = dispatcher; this.codecTreeFactory = codecTreeFactory; diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPProtocolSessionPromise.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPProtocolSessionPromise.java index 652a965c3f..2b2efc609c 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPProtocolSessionPromise.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPProtocolSessionPromise.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.bgp.rib.impl.protocol; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import io.netty.bootstrap.Bootstrap; import io.netty.channel.ChannelFuture; @@ -49,10 +51,10 @@ public final class BGPProtocolSessionPromise extends Defau public BGPProtocolSessionPromise(@Nonnull final InetSocketAddress remoteAddress, final int retryTimer, @Nonnull final Bootstrap bootstrap, @Nonnull final BGPPeerRegistry peerRegistry) { super(GlobalEventExecutor.INSTANCE); - this.address = Preconditions.checkNotNull(remoteAddress); + this.address = requireNonNull(remoteAddress); this.retryTimer = retryTimer; - this.bootstrap = Preconditions.checkNotNull(bootstrap); - this.peerRegistry = Preconditions.checkNotNull(peerRegistry); + this.bootstrap = requireNonNull(bootstrap); + this.peerRegistry = requireNonNull(peerRegistry); this.listenerRegistration = this.peerRegistry.registerPeerSessionListener( new PeerRegistrySessionListenerImpl(this, StrictBGPPeerRegistry.getIpAddress(this.address))); } @@ -115,7 +117,7 @@ public final class BGPProtocolSessionPromise extends Defau public synchronized boolean cancel(final boolean mayInterruptIfRunning) { closePeerSessionListener(); if (super.cancel(mayInterruptIfRunning)) { - Preconditions.checkNotNull(this.pending); + requireNonNull(this.pending); this.pending.cancel(mayInterruptIfRunning); return true; } diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPReconnectPromise.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPReconnectPromise.java index e3f592453d..1e5ff081e1 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPReconnectPromise.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/protocol/BGPReconnectPromise.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.bgp.rib.impl.protocol; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import io.netty.bootstrap.Bootstrap; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; @@ -39,10 +40,10 @@ public class BGPReconnectPromise extends DefaultPromise initializer) { super(executor); this.bootstrap = bootstrap; - this.initializer = Preconditions.checkNotNull(initializer); - this.address = Preconditions.checkNotNull(address); + this.initializer = requireNonNull(initializer); + this.address = requireNonNull(address); this.retryTimer = retryTimer; - this.peerRegistry = Preconditions.checkNotNull(peerRegistry); + this.peerRegistry = requireNonNull(peerRegistry); } public synchronized void connect() { @@ -90,19 +91,19 @@ public class BGPReconnectPromise extends DefaultPromise afiSafisAdvertized, @Nonnull final Set afiSafisGracefulAdvertized) { super(instanceIdentifier); - this.neighborAddress = Preconditions.checkNotNull(neighborAddress); + this.neighborAddress = requireNonNull(neighborAddress); this.groupId = groupId; - this.afiSafisAdvertized = Preconditions.checkNotNull(afiSafisAdvertized); - this.afiSafisGracefulAdvertized = Preconditions.checkNotNull(afiSafisGracefulAdvertized); + this.afiSafisAdvertized = requireNonNull(afiSafisAdvertized); + this.afiSafisGracefulAdvertized = requireNonNull(afiSafisGracefulAdvertized); } @Override diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/state/BGPRIBStateImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/state/BGPRIBStateImpl.java index e09e5f5899..6c523ec15b 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/state/BGPRIBStateImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/state/BGPRIBStateImpl.java @@ -9,6 +9,8 @@ package org.opendaylight.protocol.bgp.rib.impl.state; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import java.util.HashMap; import java.util.Map; @@ -38,8 +40,8 @@ public class BGPRIBStateImpl extends DefaultRibReference implements BGPRIBState, protected BGPRIBStateImpl(final KeyedInstanceIdentifier instanceIdentifier, @Nonnull final BgpId routeId, @Nonnull final AsNumber localAs) { super(instanceIdentifier); - this.routeId = Preconditions.checkNotNull(routeId); - this.localAs = Preconditions.checkNotNull(localAs); + this.routeId = requireNonNull(routeId); + this.localAs = requireNonNull(localAs); } @Override diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/stats/peer/BGPPeerStatsImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/stats/peer/BGPPeerStatsImpl.java index 1716cd04fd..88fefcfe74 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/stats/peer/BGPPeerStatsImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/stats/peer/BGPPeerStatsImpl.java @@ -7,6 +7,7 @@ */ package org.opendaylight.protocol.bgp.rib.impl.stats.peer; +import static java.util.Objects.requireNonNull; import static org.opendaylight.protocol.bgp.rib.impl.CountersUtil.toZeroBasedCounter32; import com.google.common.base.Preconditions; @@ -34,11 +35,11 @@ public final class BGPPeerStatsImpl implements BGPPeerStats { public BGPPeerStatsImpl(@Nonnull final String peerName, @Nonnull final Set tablesKeySet, @Nonnull final BGPPeerStateImpl neighborState) { - Preconditions.checkNotNull(peerName); - this.tablesKeySet = Preconditions.checkNotNull(tablesKeySet); + requireNonNull(peerName); + this.tablesKeySet = requireNonNull(tablesKeySet); this.adjRibInRouteCounters = new PerTableTypeRouteCounter(tablesKeySet); this.adjRibOutRouteCounters = new PerTableTypeRouteCounter(tablesKeySet); - this.neighborState = Preconditions.checkNotNull(neighborState); + this.neighborState = requireNonNull(neighborState); } public PerTableTypeRouteCounter getAdjRibInRouteCounters() { @@ -50,7 +51,7 @@ public final class BGPPeerStatsImpl implements BGPPeerStats { } private RouteTable createRouteTable(@Nonnull final TablesKey tablesKey) { - Preconditions.checkNotNull(tablesKey); + requireNonNull(tablesKey); final RouteTable routeTable = new RouteTable(); // FIXME: setTableType() is DEPRECATED, use setAfi() and setSafi() instead routeTable.setTableType("afi=" + tablesKey.getAfi().getSimpleName() + ",safi=" + tablesKey.getSafi().getSimpleName()); diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/stats/peer/BGPSessionStatsImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/stats/peer/BGPSessionStatsImpl.java index 68497e787b..7ab30ce91b 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/stats/peer/BGPSessionStatsImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/stats/peer/BGPSessionStatsImpl.java @@ -8,6 +8,8 @@ package org.opendaylight.protocol.bgp.rib.impl.stats.peer; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.base.Stopwatch; @@ -108,21 +110,21 @@ public final class BGPSessionStatsImpl implements BGPSessionStats { } private static void updateReceivedMsg(final Received received) { - Preconditions.checkNotNull(received); + requireNonNull(received); final long count = received.getCount() == null ? 0L : received.getCount().getValue(); received.setCount(new ZeroBasedCounter32(count + 1)); received.setTimestamp(new Timestamp(StatisticsUtil.getCurrentTimestampInSeconds())); } private static void updateSentMsg(final Sent sent) { - Preconditions.checkNotNull(sent); + requireNonNull(sent); final long count = sent.getCount() == null ? 0L : sent.getCount().getValue(); sent.setCount(new ZeroBasedCounter32(count + 1)); sent.setTimestamp(new Timestamp(StatisticsUtil.getCurrentTimestampInSeconds())); } private static AdvertizedTableTypes addTableType(final BgpTableType type) { - Preconditions.checkNotNull(type); + requireNonNull(type); final AdvertizedTableTypes att = new AdvertizedTableTypes(); final QName afi = BindingReflections.findQName(type.getAfi()).intern(); final QName safi = BindingReflections.findQName(type.getSafi()).intern(); @@ -132,7 +134,7 @@ public final class BGPSessionStatsImpl implements BGPSessionStats { } private static AdvertisedAddPathTableTypes addAddPathTableType(final AddressFamilies addressFamilies) { - Preconditions.checkNotNull(addressFamilies); + requireNonNull(addressFamilies); final AdvertisedAddPathTableTypes att = new AdvertisedAddPathTableTypes(); att.setAfi(new IdentityAttributeRef(BindingReflections.findQName(addressFamilies.getAfi()).intern().toString())); att.setSafi(new IdentityAttributeRef(BindingReflections.findQName(addressFamilies.getSafi()).intern().toString())); @@ -141,7 +143,7 @@ public final class BGPSessionStatsImpl implements BGPSessionStats { } private static RemotePeerPreferences setRemotePeerPref(final Channel channel, final Optional localPreferences) { - Preconditions.checkNotNull(channel); + requireNonNull(channel); final RemotePeerPreferences pref = new RemotePeerPreferences(); final InetSocketAddress isa = (InetSocketAddress) channel.localAddress(); pref.setHost(IpAddressBuilder.getDefaultInstance(isa.getAddress().getHostAddress())); @@ -201,8 +203,8 @@ public final class BGPSessionStatsImpl implements BGPSessionStats { private static LocalPeerPreferences setLocalPeerPref(final Open remoteOpen, final Channel channel, final Collection tableTypes, final List addPathTypes) { - Preconditions.checkNotNull(remoteOpen); - Preconditions.checkNotNull(channel); + requireNonNull(remoteOpen); + requireNonNull(channel); final LocalPeerPreferences pref = new LocalPeerPreferences(); final InetSocketAddress isa = (InetSocketAddress) channel.remoteAddress(); pref.setHost(IpAddressBuilder.getDefaultInstance(isa.getAddress().getHostAddress())); @@ -299,7 +301,7 @@ public final class BGPSessionStatsImpl implements BGPSessionStats { } private void updateReceivedMsgErr(@Nonnull final Notify error) { - Preconditions.checkNotNull(error); + requireNonNull(error); final List errList = this.errMsgs.getErrorReceived(); ErrorReceived received = null; for (ErrorReceived err : errList) { @@ -323,7 +325,7 @@ public final class BGPSessionStatsImpl implements BGPSessionStats { } private void updateSentMsgErr(@Nonnull final Notify error) { - Preconditions.checkNotNull(error); + requireNonNull(error); final List errList = this.errMsgs.getErrorSent(); ErrorSent sent = null; for (ErrorSent err : errList) { diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/stats/peer/route/PerTableTypeRouteCounter.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/stats/peer/route/PerTableTypeRouteCounter.java index 0c0ca39e1a..44dde3a755 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/stats/peer/route/PerTableTypeRouteCounter.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/stats/peer/route/PerTableTypeRouteCounter.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.bgp.rib.impl.stats.peer.route; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import java.util.Map; import java.util.Set; @@ -34,7 +36,7 @@ public final class PerTableTypeRouteCounter { } public final synchronized LongAdder init(@Nonnull final TablesKey tablesKey) { - LongAdder counter = this.counters.get(Preconditions.checkNotNull(tablesKey)); + LongAdder counter = this.counters.get(requireNonNull(tablesKey)); if (counter == null) { counter = new LongAdder(); this.counters.put(tablesKey, counter); @@ -51,7 +53,7 @@ public final class PerTableTypeRouteCounter { * @param tablesKey */ @Nonnull public final LongAdder getCounterOrDefault(@Nonnull final TablesKey tablesKey) { - return this.counters.getOrDefault(Preconditions.checkNotNull(tablesKey), new LongAdder()); + return this.counters.getOrDefault(requireNonNull(tablesKey), new LongAdder()); } /** @@ -65,7 +67,7 @@ public final class PerTableTypeRouteCounter { return init(tablesKey); } - return this.counters.get(Preconditions.checkNotNull(tablesKey)); + return this.counters.get(requireNonNull(tablesKey)); } public final Map getCounters() { diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/stats/rib/impl/BGPRenderStatsImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/stats/rib/impl/BGPRenderStatsImpl.java index 368dbd5dc1..88645d55fd 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/stats/rib/impl/BGPRenderStatsImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/stats/rib/impl/BGPRenderStatsImpl.java @@ -7,6 +7,7 @@ */ package org.opendaylight.protocol.bgp.rib.impl.stats.rib.impl; +import static java.util.Objects.requireNonNull; import static org.opendaylight.protocol.bgp.rib.impl.CountersUtil.toZeroBasedCounter32; import com.google.common.base.Preconditions; @@ -42,10 +43,10 @@ public final class BGPRenderStatsImpl implements BGPRenderStats { public BGPRenderStatsImpl(@Nonnull final BgpId bgpId, @Nonnull final RibId ribId, @Nonnull final AsNumber localAs, @Nullable final ClusterIdentifier clusterId, @Nonnull final BGPRIBState globalState, @Nonnull final Set tablesKeys) { - this.bgpId = Preconditions.checkNotNull(bgpId); - this.ribId = Preconditions.checkNotNull(ribId); - this.globalState = Preconditions.checkNotNull(globalState); - this.tablesKeys = Preconditions.checkNotNull(tablesKeys); + this.bgpId = requireNonNull(bgpId); + this.ribId = requireNonNull(ribId); + this.globalState = requireNonNull(globalState); + this.tablesKeys = requireNonNull(tablesKeys); this.localAs = localAs; this.clusterId = clusterId; } diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBExtensionProviderActivator.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBExtensionProviderActivator.java index d830261fa6..fcc63be4cf 100644 --- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBExtensionProviderActivator.java +++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBExtensionProviderActivator.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.bgp.rib.spi; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import java.util.List; import javax.annotation.concurrent.GuardedBy; @@ -26,7 +28,7 @@ public abstract class AbstractRIBExtensionProviderActivator implements AutoClose public final synchronized void startRIBExtensionProvider(final RIBExtensionProviderContext context) { Preconditions.checkState(this.registrations == null); - this.registrations = Preconditions.checkNotNull(startRIBExtensionProviderImpl(context)); + this.registrations = requireNonNull(startRIBExtensionProviderImpl(context)); } @Override diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupport.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupport.java index e17f074532..e287741277 100644 --- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupport.java +++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupport.java @@ -7,9 +7,10 @@ */ package org.opendaylight.protocol.bgp.rib.spi; +import static java.util.Objects.requireNonNull; + import com.google.common.annotations.Beta; import com.google.common.base.Optional; -import com.google.common.base.Preconditions; import java.util.Collection; import java.util.Collections; import javax.annotation.Nonnull; @@ -97,9 +98,9 @@ public abstract class AbstractRIBSupport implements RIBSupport { final QName qname = BindingReflections.findQName(containerClass).intern(); this.routesContainerIdentifier = new NodeIdentifier(qname); this.routeAttributesIdentifier = new NodeIdentifier(QName.create(qname, Attributes.QNAME.getLocalName().intern())); - this.cazeClass = Preconditions.checkNotNull(cazeClass); - this.containerClass = Preconditions.checkNotNull(containerClass); - this.listClass = Preconditions.checkNotNull(listClass); + this.cazeClass = requireNonNull(cazeClass); + this.containerClass = requireNonNull(containerClass); + this.listClass = requireNonNull(listClass); this.routeQname = QName.create(qname, BindingReflections.findQName(listClass).intern().getLocalName()); this.routesListIdentifier = new NodeIdentifier(this.routeQname); this.emptyRoutes = Builders.choiceBuilder().withNodeIdentifier(ROUTES).addChild(Builders.containerBuilder() diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/ServiceLoaderRIBExtensionConsumerContext.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/ServiceLoaderRIBExtensionConsumerContext.java index 98042ddc3c..81fa92bd5b 100644 --- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/ServiceLoaderRIBExtensionConsumerContext.java +++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/ServiceLoaderRIBExtensionConsumerContext.java @@ -7,7 +7,7 @@ */ package org.opendaylight.protocol.bgp.rib.spi; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; import java.util.ServiceLoader; @@ -22,7 +22,7 @@ public final class ServiceLoaderRIBExtensionConsumerContext extends SimpleRIBExt private final ServiceLoader loader; private ServiceLoaderRIBExtensionConsumerContext(final ServiceLoader loader) { - this.loader = Preconditions.checkNotNull(loader); + this.loader = requireNonNull(loader); for (RIBExtensionProviderActivator a : loader) { a.startRIBExtensionProvider(this); diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/SimpleRIBExtensionProviderContext.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/SimpleRIBExtensionProviderContext.java index acd8fb1368..c37b1b29c3 100644 --- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/SimpleRIBExtensionProviderContext.java +++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/SimpleRIBExtensionProviderContext.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.bgp.rib.spi; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import java.util.HashSet; import java.util.Set; @@ -75,7 +77,7 @@ public class SimpleRIBExtensionProviderContext implements RIBExtensionProviderCo @Override public RIBSupport getRIBSupport(final TablesKey key) { - return this.supports.get(Preconditions.checkNotNull(key)); + return this.supports.get(requireNonNull(key)); } @Override diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/SimpleRIBExtensionProviderContextActivator.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/SimpleRIBExtensionProviderContextActivator.java index b149d0d730..2d91f32102 100644 --- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/SimpleRIBExtensionProviderContextActivator.java +++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/SimpleRIBExtensionProviderContextActivator.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.bgp.rib.spi; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,8 +26,8 @@ public final class SimpleRIBExtensionProviderContextActivator implements AutoClo public SimpleRIBExtensionProviderContextActivator(final RIBExtensionProviderContext providerContext, final List extensionActivators) { - this.providerContext = Preconditions.checkNotNull(providerContext); - this.extensionActivators = Preconditions.checkNotNull(extensionActivators); + this.providerContext = requireNonNull(providerContext); + this.extensionActivators = requireNonNull(extensionActivators); } public void start() { diff --git a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractReachabilityTopologyBuilder.java b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractReachabilityTopologyBuilder.java index c32403d46d..30fd9e8a36 100644 --- a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractReachabilityTopologyBuilder.java +++ b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractReachabilityTopologyBuilder.java @@ -7,6 +7,8 @@ */ package org.opendaylight.bgpcep.bgp.topology.provider; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Optional; import com.google.common.base.Preconditions; import java.util.Collections; @@ -59,7 +61,7 @@ abstract class AbstractReachabilityTopologyBuilder extends Abst private int useCount = 1; NodeUsage(final InstanceIdentifier attrId) { - this.attrId = Preconditions.checkNotNull(attrId); + this.attrId = requireNonNull(attrId); } } diff --git a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractTopologyBuilder.java b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractTopologyBuilder.java index 6bf77c7155..346549bf9a 100644 --- a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractTopologyBuilder.java +++ b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractTopologyBuilder.java @@ -7,6 +7,8 @@ */ package org.opendaylight.bgpcep.bgp.topology.provider; +import static java.util.Objects.requireNonNull; + import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.FutureCallback; @@ -83,8 +85,8 @@ public abstract class AbstractTopologyBuilder implements Cluste final Class safi, final long listenerResetLimitInMillsec, final int listenerResetEnforceCounter) { this.dataProvider = dataProvider; - this.locRibReference = Preconditions.checkNotNull(locRibReference); - this.topologyKey = new TopologyKey(Preconditions.checkNotNull(topologyId)); + this.locRibReference = requireNonNull(locRibReference); + this.topologyKey = new TopologyKey(requireNonNull(topologyId)); this.topologyTypes = types; this.afi = afi; this.safi = safi; @@ -224,7 +226,7 @@ public abstract class AbstractTopologyBuilder implements Cluste } private synchronized void initOperationalTopology() { - Preconditions.checkNotNull(this.chain, "A valid transaction chain must be provided."); + requireNonNull(this.chain, "A valid transaction chain must be provided."); final WriteTransaction trans = this.chain.newWriteOnlyTransaction(); trans.put(LogicalDatastoreType.OPERATIONAL, this.topology, new TopologyBuilder().setKey(this.topologyKey).setServerProvided(Boolean.TRUE).setTopologyTypes(this.topologyTypes) @@ -248,7 +250,7 @@ public abstract class AbstractTopologyBuilder implements Cluste * @throws TransactionCommitFailedException */ private synchronized ListenableFuture destroyOperationalTopology() { - Preconditions.checkNotNull(this.chain, "A valid transaction chain must be provided."); + requireNonNull(this.chain, "A valid transaction chain must be provided."); final WriteTransaction trans = this.chain.newWriteOnlyTransaction(); trans.delete(LogicalDatastoreType.OPERATIONAL, getInstanceIdentifier()); final ListenableFuture future = trans.submit(); @@ -304,7 +306,7 @@ public abstract class AbstractTopologyBuilder implements Cluste */ @VisibleForTesting protected synchronized void resetListener() { - Preconditions.checkNotNull(this.listenerRegistration, "Listener on topology %s hasn't been initialized.", this); + requireNonNull(this.listenerRegistration, "Listener on topology " + this + " hasn't been initialized."); LOG.debug("Resetting data change listener for topology builder {}", getInstanceIdentifier()); // unregister current listener to prevent incoming data tree change first unregisterDataChangeListener(); diff --git a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilder.java b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilder.java index cfb0354edb..ba9b989edf 100644 --- a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilder.java +++ b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilder.java @@ -7,6 +7,8 @@ */ package org.opendaylight.bgpcep.bgp.topology.provider; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import com.google.common.collect.Collections2; import com.google.common.collect.Lists; @@ -138,7 +140,7 @@ public class LinkstateTopologyBuilder extends AbstractTopologyBuilder(LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(NetworkTopology.class).child(Topology.class)), this); LOG.info("BGP topology deployer started."); diff --git a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/config/TopologyReferenceSingletonServiceImpl.java b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/config/TopologyReferenceSingletonServiceImpl.java index 4b19ca6977..7c80d67eeb 100644 --- a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/config/TopologyReferenceSingletonServiceImpl.java +++ b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/config/TopologyReferenceSingletonServiceImpl.java @@ -8,6 +8,8 @@ package org.opendaylight.bgpcep.bgp.topology.provider.config; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import com.google.common.util.concurrent.ListenableFuture; import java.util.function.Function; @@ -31,8 +33,8 @@ final class TopologyReferenceSingletonServiceImpl implements TopologyReferenceSi TopologyReferenceSingletonServiceImpl(final AbstractTopologyBuilder topologyBuilder, final BgpTopologyDeployer deployer, final Topology configuration, final Function writeFunction) { this.writeFunction = writeFunction; - this.configuration = Preconditions.checkNotNull(configuration); - this.topologyBuilder = Preconditions.checkNotNull(topologyBuilder); + this.configuration = requireNonNull(configuration); + this.topologyBuilder = requireNonNull(topologyBuilder); this.serviceRegistration = deployer.registerService(this); } diff --git a/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractTopologyBuilderTest.java b/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractTopologyBuilderTest.java index ddf7e3db67..266a4ba5a2 100644 --- a/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractTopologyBuilderTest.java +++ b/bgp/topology-provider/src/test/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractTopologyBuilderTest.java @@ -8,7 +8,8 @@ package org.opendaylight.bgpcep.bgp.topology.provider; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.util.Collections; import org.junit.Before; import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; @@ -28,7 +29,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public abstract class AbstractTopologyBuilderTest extends AbstractConcurrentDataBrokerTest { static final TopologyId TEST_TOPOLOGY_ID = new TopologyId("test-topo"); static final RibReference LOC_RIB_REF = new DefaultRibReference(InstanceIdentifier.create(BgpRib.class) - .child(Rib.class, new RibKey(Preconditions.checkNotNull(new RibId("test-rib"))))); + .child(Rib.class, new RibKey(requireNonNull(new RibId("test-rib"))))); @Before public void setUp() { diff --git a/bgp/util/src/main/java/org/opendaylight/protocol/bgp/util/HexDumpBGPFileParser.java b/bgp/util/src/main/java/org/opendaylight/protocol/bgp/util/HexDumpBGPFileParser.java index 991648ca3c..6f22c84274 100644 --- a/bgp/util/src/main/java/org/opendaylight/protocol/bgp/util/HexDumpBGPFileParser.java +++ b/bgp/util/src/main/java/org/opendaylight/protocol/bgp/util/HexDumpBGPFileParser.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.bgp.util; +import static java.util.Objects.requireNonNull; + import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.base.Strings; @@ -44,7 +46,7 @@ public final class HexDumpBGPFileParser { } public static List parseMessages(final InputStream is) throws IOException { - Preconditions.checkNotNull(is); + requireNonNull(is); try (InputStreamReader isr = new InputStreamReader(is, "UTF-8")) { return parseMessages(CharStreams.toString(isr)); } finally { diff --git a/concepts/src/main/java/org/opendaylight/protocol/concepts/DefaultInstanceReference.java b/concepts/src/main/java/org/opendaylight/protocol/concepts/DefaultInstanceReference.java index 766af9efa4..48ff6ec01a 100644 --- a/concepts/src/main/java/org/opendaylight/protocol/concepts/DefaultInstanceReference.java +++ b/concepts/src/main/java/org/opendaylight/protocol/concepts/DefaultInstanceReference.java @@ -7,7 +7,7 @@ */ package org.opendaylight.protocol.concepts; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; @@ -19,7 +19,7 @@ public class DefaultInstanceReference implements InstanceR private final InstanceIdentifier instanceIdentifier; public DefaultInstanceReference(final InstanceIdentifier instanceIdentifier) { - this.instanceIdentifier = Preconditions.checkNotNull(instanceIdentifier); + this.instanceIdentifier = requireNonNull(instanceIdentifier); } @Override diff --git a/data-change-counter/src/main/java/org/opendaylight/protocol/data/change/counter/TopologyDataChangeCounterDeployer.java b/data-change-counter/src/main/java/org/opendaylight/protocol/data/change/counter/TopologyDataChangeCounterDeployer.java index e8449124cf..7b6f341ef5 100644 --- a/data-change-counter/src/main/java/org/opendaylight/protocol/data/change/counter/TopologyDataChangeCounterDeployer.java +++ b/data-change-counter/src/main/java/org/opendaylight/protocol/data/change/counter/TopologyDataChangeCounterDeployer.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.data.change.counter; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import java.util.Collection; import java.util.HashMap; @@ -36,7 +38,7 @@ public class TopologyDataChangeCounterDeployer implements DataTreeChangeListener private ListenerRegistration registration; public TopologyDataChangeCounterDeployer(final DataBroker dataBroker) { - this.dataBroker = Preconditions.checkNotNull(dataBroker); + this.dataBroker = requireNonNull(dataBroker); } public synchronized void register() { diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/AbstractEROWithSubobjectsParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/AbstractEROWithSubobjectsParser.java index 8fabbda136..57ca42011c 100644 --- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/AbstractEROWithSubobjectsParser.java +++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/AbstractEROWithSubobjectsParser.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.pcep.parser.object; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufUtil; @@ -30,7 +32,7 @@ public abstract class AbstractEROWithSubobjectsParser implements ObjectParser, O private final EROSubobjectRegistry subobjReg; protected AbstractEROWithSubobjectsParser(final EROSubobjectRegistry subobjReg) { - this.subobjReg = Preconditions.checkNotNull(subobjReg); + this.subobjReg = requireNonNull(subobjReg); } protected List parseSubobjects(final ByteBuf buffer) throws PCEPDeserializerException { diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/AbstractRROWithSubobjectsParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/AbstractRROWithSubobjectsParser.java index 4e54d7f2fd..229758aa24 100644 --- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/AbstractRROWithSubobjectsParser.java +++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/AbstractRROWithSubobjectsParser.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.pcep.parser.object; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufUtil; @@ -29,7 +31,7 @@ public abstract class AbstractRROWithSubobjectsParser implements ObjectParser, O private static final int HEADER_LENGTH = 2; protected AbstractRROWithSubobjectsParser(final RROSubobjectRegistry subobjReg) { - this.subobjReg = Preconditions.checkNotNull(subobjReg); + this.subobjReg = requireNonNull(subobjReg); } protected List parseSubobjects(final ByteBuf buffer) throws PCEPDeserializerException { diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/AbstractXROWithSubobjectsParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/AbstractXROWithSubobjectsParser.java index ef9ee45b2c..1992e290f0 100644 --- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/AbstractXROWithSubobjectsParser.java +++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/object/AbstractXROWithSubobjectsParser.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.pcep.parser.object; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import com.google.common.primitives.UnsignedBytes; import io.netty.buffer.ByteBuf; @@ -31,7 +33,7 @@ public abstract class AbstractXROWithSubobjectsParser implements ObjectParser, O private final XROSubobjectRegistry subobjReg; protected AbstractXROWithSubobjectsParser(final XROSubobjectRegistry subobjReg) { - this.subobjReg = Preconditions.checkNotNull(subobjReg); + this.subobjReg = requireNonNull(subobjReg); } protected List parseSubobjects(final ByteBuf buffer) throws PCEPDeserializerException { diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/EROLabelSubobjectParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/EROLabelSubobjectParser.java index 0b42f31691..0c84393def 100644 --- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/EROLabelSubobjectParser.java +++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/EROLabelSubobjectParser.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.pcep.parser.subobject; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -41,7 +43,7 @@ public class EROLabelSubobjectParser implements EROSubobjectParser, EROSubobject private final LabelRegistry registry; public EROLabelSubobjectParser(final LabelRegistry labelReg) { - this.registry = Preconditions.checkNotNull(labelReg); + this.registry = requireNonNull(labelReg); } @Override diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/RROLabelSubobjectParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/RROLabelSubobjectParser.java index ca1e361e6c..f26660cb2c 100644 --- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/RROLabelSubobjectParser.java +++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/subobject/RROLabelSubobjectParser.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.pcep.parser.subobject; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -42,7 +44,7 @@ public class RROLabelSubobjectParser implements RROSubobjectParser, RROSubobject private final LabelRegistry registry; public RROLabelSubobjectParser(final LabelRegistry labelReg) { - this.registry = Preconditions.checkNotNull(labelReg); + this.registry = requireNonNull(labelReg); } @Override @@ -69,7 +71,7 @@ public class RROLabelSubobjectParser implements RROSubobjectParser, RROSubobject @Override public void serializeSubobject(final Subobject subobject, final ByteBuf buffer) { - Preconditions.checkNotNull(subobject.getSubobjectType(), "Subobject type cannot be empty."); + requireNonNull(subobject.getSubobjectType(), "Subobject type cannot be empty."); final Label label = ((LabelCase) subobject.getSubobjectType()).getLabel(); final ByteBuf body = Unpooled.buffer(); this.registry.serializeLabel(label.isUniDirectional(), label.isGlobal(), label.getLabelType(), body); diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/AbstractSessionNegotiator.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/AbstractSessionNegotiator.java index 2fdbc72455..a6d304e6e5 100644 --- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/AbstractSessionNegotiator.java +++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/AbstractSessionNegotiator.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.pcep.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import io.netty.channel.Channel; import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelHandlerContext; @@ -25,8 +26,8 @@ public abstract class AbstractSessionNegotiator extends ChannelInboundHandlerAda protected final Promise promise; protected AbstractSessionNegotiator(final Promise promise, final Channel channel) { - this.promise = Preconditions.checkNotNull(promise); - this.channel = Preconditions.checkNotNull(channel); + this.promise = requireNonNull(promise); + this.channel = requireNonNull(channel); } protected final void negotiationSuccessful(final PCEPSessionImpl session) { diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/DefaultPCEPSessionNegotiator.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/DefaultPCEPSessionNegotiator.java index f019c34eaa..6d3bad589b 100644 --- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/DefaultPCEPSessionNegotiator.java +++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/DefaultPCEPSessionNegotiator.java @@ -7,8 +7,9 @@ */ package org.opendaylight.protocol.pcep.impl; +import static java.util.Objects.requireNonNull; + import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; import io.netty.channel.Channel; import io.netty.util.concurrent.Promise; import org.opendaylight.protocol.pcep.PCEPSessionListener; @@ -27,7 +28,7 @@ public final class DefaultPCEPSessionNegotiator extends AbstractPCEPSessionNegot this.maxUnknownMessages = maxUnknownMessages; this.myLocalPrefs = new OpenBuilder().setKeepalive(localPrefs.getKeepalive()).setDeadTimer(localPrefs.getDeadTimer()).setSessionId( sessionId).setTlvs(localPrefs.getTlvs()).build(); - this.listener = Preconditions.checkNotNull(listener); + this.listener = requireNonNull(listener); } public DefaultPCEPSessionNegotiator(final Promise promise, final Channel channel, diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/DefaultPCEPSessionNegotiatorFactory.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/DefaultPCEPSessionNegotiatorFactory.java index b7a63514f8..97b58d6f1f 100644 --- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/DefaultPCEPSessionNegotiatorFactory.java +++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/DefaultPCEPSessionNegotiatorFactory.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.pcep.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import io.netty.channel.Channel; import io.netty.util.concurrent.Promise; import java.net.InetSocketAddress; @@ -27,7 +28,7 @@ public final class DefaultPCEPSessionNegotiatorFactory extends AbstractPCEPSessi } public DefaultPCEPSessionNegotiatorFactory(final PCEPSessionProposalFactory spf, final int maxUnknownMessages, final Tls tlsConfiguration) { - this.spf = Preconditions.checkNotNull(spf); + this.spf = requireNonNull(spf); this.maxUnknownMessages = maxUnknownMessages; this.tlsConfiguration = tlsConfiguration; } diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPByteToMessageDecoder.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPByteToMessageDecoder.java index 184ecfb907..45a8aedf1f 100644 --- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPByteToMessageDecoder.java +++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPByteToMessageDecoder.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.pcep.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufUtil; import io.netty.channel.ChannelFutureListener; @@ -31,7 +32,7 @@ public final class PCEPByteToMessageDecoder extends ByteToMessageDecoder { private final MessageRegistry registry; public PCEPByteToMessageDecoder(final MessageRegistry registry) { - this.registry = Preconditions.checkNotNull(registry); + this.registry = requireNonNull(registry); } @Override diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPDispatcherImpl.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPDispatcherImpl.java index 17c81945e0..0c3a399429 100644 --- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPDispatcherImpl.java +++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPDispatcherImpl.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.pcep.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import io.netty.bootstrap.ServerBootstrap; import io.netty.buffer.PooledByteBufAllocator; import io.netty.channel.ChannelFuture; @@ -65,16 +66,16 @@ public class PCEPDispatcherImpl implements PCEPDispatcher, Closeable { public PCEPDispatcherImpl(@Nonnull final MessageRegistry registry, @Nonnull final PCEPSessionNegotiatorFactory negotiatorFactory, @Nonnull final EventLoopGroup bossGroup, @Nonnull final EventLoopGroup workerGroup) { - this.snf = Preconditions.checkNotNull(negotiatorFactory); + this.snf = requireNonNull(negotiatorFactory); this.hf = new PCEPHandlerFactory(registry); if (Epoll.isAvailable()) { this.bossGroup = new EpollEventLoopGroup(); this.workerGroup = new EpollEventLoopGroup(); } else { - this.bossGroup = Preconditions.checkNotNull(bossGroup); - this.workerGroup = Preconditions.checkNotNull(workerGroup); + this.bossGroup = requireNonNull(bossGroup); + this.workerGroup = requireNonNull(workerGroup); } - this.executor = Preconditions.checkNotNull(GlobalEventExecutor.INSTANCE); + this.executor = requireNonNull(GlobalEventExecutor.INSTANCE); } @Override diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPHandlerFactory.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPHandlerFactory.java index 7768f373f8..10944c5c27 100644 --- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPHandlerFactory.java +++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPHandlerFactory.java @@ -7,7 +7,7 @@ */ package org.opendaylight.protocol.pcep.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelOutboundHandler; @@ -22,7 +22,7 @@ public final class PCEPHandlerFactory { private final ChannelOutboundHandler encoder; public PCEPHandlerFactory(final MessageRegistry registry) { - this.registry = Preconditions.checkNotNull(registry); + this.registry = requireNonNull(registry); this.encoder = new PCEPMessageToByteEncoder(registry); } diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPMessageToByteEncoder.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPMessageToByteEncoder.java index 13307ea287..1c1b322a6a 100644 --- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPMessageToByteEncoder.java +++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPMessageToByteEncoder.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.pcep.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufUtil; import io.netty.channel.ChannelHandler.Sharable; @@ -29,12 +30,12 @@ public final class PCEPMessageToByteEncoder extends MessageToByteEncoder extends Def PCEPProtocolSessionPromise(final EventExecutor executor, final InetSocketAddress address, final int retryTimer, final int connectTimeout, final Bootstrap b) { super(executor); - this.address = Preconditions.checkNotNull(address); + this.address = requireNonNull(address); this.retryTimer = retryTimer; this.connectTimeout = connectTimeout; - this.b = Preconditions.checkNotNull(b); + this.b = requireNonNull(b); } synchronized void connect() { diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImpl.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImpl.java index c77c66d742..22ff18e53e 100644 --- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImpl.java +++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPSessionImpl.java @@ -7,10 +7,11 @@ */ package org.opendaylight.protocol.pcep.impl; +import static java.util.Objects.requireNonNull; + import com.google.common.annotations.VisibleForTesting; import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects.ToStringHelper; -import com.google.common.base.Preconditions; import com.google.common.base.Ticker; import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; @@ -100,10 +101,10 @@ public class PCEPSessionImpl extends SimpleChannelInboundHandler implem PCEPSessionImpl(final PCEPSessionListener listener, final int maxUnknownMessages, final Channel channel, final Open localOpen, final Open remoteOpen) { - this.listener = Preconditions.checkNotNull(listener); - this.channel = Preconditions.checkNotNull(channel); - this.localOpen = Preconditions.checkNotNull(localOpen); - this.remoteOpen = Preconditions.checkNotNull(remoteOpen); + this.listener = requireNonNull(listener); + this.channel = requireNonNull(channel); + this.localOpen = requireNonNull(localOpen); + this.remoteOpen = requireNonNull(remoteOpen); this.lastMessageReceivedAt = TICKER.read(); if (maxUnknownMessages != 0) { diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPSessionState.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPSessionState.java index ab15b99745..d3bee9df04 100644 --- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPSessionState.java +++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/PCEPSessionState.java @@ -8,7 +8,8 @@ package org.opendaylight.protocol.pcep.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import io.netty.channel.Channel; import java.net.InetSocketAddress; import org.opendaylight.protocol.util.StatisticsUtil; @@ -40,9 +41,9 @@ final class PCEPSessionState { private final MessagesBuilder msgsBuilder; public PCEPSessionState(final Open remoteOpen, final Open localOpen, final Channel channel) { - Preconditions.checkNotNull(remoteOpen); - Preconditions.checkNotNull(localOpen); - Preconditions.checkNotNull(channel); + requireNonNull(remoteOpen); + requireNonNull(localOpen); + requireNonNull(channel); this.peerPref = getRemotePref(remoteOpen, channel); this.localPref = getLocalPref(localOpen, channel); this.lastReceivedErrorBuilder = new LastReceivedErrorBuilder(); @@ -108,7 +109,7 @@ final class PCEPSessionState { } private static ErrorObject getErrorObject(final Message msg) { - Preconditions.checkNotNull(msg); + requireNonNull(msg); final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.pcerr.message.PcerrMessage errMsg = ((PcerrMessage) msg).getPcerrMessage(); return errMsg.getErrors().get(errMsg.getErrors().size() - 1).getErrorObject(); diff --git a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tls/SslContextFactory.java b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tls/SslContextFactory.java index 13b01a97af..2e98533305 100644 --- a/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tls/SslContextFactory.java +++ b/pcep/impl/src/main/java/org/opendaylight/protocol/pcep/impl/tls/SslContextFactory.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.pcep.impl.tls; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.io.IOException; import java.security.KeyStore; import java.security.NoSuchAlgorithmException; @@ -36,7 +37,7 @@ public class SslContextFactory { * keystore types */ public SslContextFactory(final Tls tlsConfig) { - this.tlsConfig = Preconditions.checkNotNull(tlsConfig); + this.tlsConfig = requireNonNull(tlsConfig); } public SSLContext getServerContext() { diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPDispatcherImplTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPDispatcherImplTest.java index 269b0a3c9e..2be37f019b 100755 --- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPDispatcherImplTest.java +++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPDispatcherImplTest.java @@ -8,11 +8,11 @@ package org.opendaylight.protocol.pcep.impl; +import static java.util.Objects.requireNonNull; import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.any; import static org.opendaylight.protocol.util.CheckUtil.waitFutureSuccess; -import com.google.common.base.Preconditions; import io.netty.bootstrap.Bootstrap; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelInitializer; @@ -191,10 +191,10 @@ public class PCEPDispatcherImplTest { private final EventLoopGroup workerGroup; PCCMock(final PCEPSessionNegotiatorFactory negotiatorFactory, final PCEPHandlerFactory factory) { - this.workerGroup = Preconditions.checkNotNull(new NioEventLoopGroup()); - this.negotiatorFactory = Preconditions.checkNotNull(negotiatorFactory); - this.factory = Preconditions.checkNotNull(factory); - this.executor = Preconditions.checkNotNull(GlobalEventExecutor.INSTANCE); + this.workerGroup = requireNonNull(new NioEventLoopGroup()); + this.negotiatorFactory = requireNonNull(negotiatorFactory); + this.factory = requireNonNull(factory); + this.executor = requireNonNull(GlobalEventExecutor.INSTANCE); } Future createClient(final InetSocketAddress address, final int retryTimer, diff --git a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCSyncOptimization.java b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCSyncOptimization.java index 40f224b031..390f54f7e6 100644 --- a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCSyncOptimization.java +++ b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCSyncOptimization.java @@ -8,8 +8,9 @@ package org.opendaylight.protocol.pcep.pcc.mock; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Optional; -import com.google.common.base.Preconditions; import java.math.BigInteger; import javax.annotation.Nonnull; import org.opendaylight.protocol.pcep.pcc.mock.api.PCCSession; @@ -31,7 +32,7 @@ final class PCCSyncOptimization { private Boolean resynchronizing = Boolean.FALSE; public PCCSyncOptimization(@Nonnull final PCCSession session) { - Preconditions.checkNotNull(session); + requireNonNull(session); final Tlvs remote = session.getRemoteTlvs(); final Tlvs local = session.localSessionCharacteristics(); this.localLspDbVersion = getLspDbVersion(local); diff --git a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTunnelManagerImpl.java b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTunnelManagerImpl.java index a8280f1401..68e516a78a 100644 --- a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTunnelManagerImpl.java +++ b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTunnelManagerImpl.java @@ -8,6 +8,7 @@ package org.opendaylight.protocol.pcep.pcc.mock; +import static java.util.Objects.requireNonNull; import static org.opendaylight.protocol.pcep.pcc.mock.spi.MsgBuilderUtil.createLsp; import static org.opendaylight.protocol.pcep.pcc.mock.spi.MsgBuilderUtil.createLspTlvs; import static org.opendaylight.protocol.pcep.pcc.mock.spi.MsgBuilderUtil.createLspTlvsEndofSync; @@ -80,8 +81,8 @@ public final class PCCTunnelManagerImpl implements PCCTunnelManager { this.redelegationTimeout = redelegationTimeout; this.stateTimeout = stateTimeout; this.plspIDsCounter = new AtomicLong(lspsCount); - this.address = InetAddresses.toAddrString(Preconditions.checkNotNull(address)); - this.timer = Preconditions.checkNotNull(timer); + this.address = InetAddresses.toAddrString(requireNonNull(address)); + this.timer = requireNonNull(timer); this.timerHandler = timerHandler; this.lspsCount = lspsCount; } diff --git a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCPeerProposal.java b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCPeerProposal.java index d8a9d62190..8e4effc792 100644 --- a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCPeerProposal.java +++ b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCPeerProposal.java @@ -8,7 +8,8 @@ package org.opendaylight.protocol.pcep.pcc.mock.protocol; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.math.BigInteger; import java.net.InetSocketAddress; import javax.annotation.Nonnull; @@ -32,7 +33,7 @@ public final class PCCPeerProposal implements PCEPPeerProposal { @Override public void setPeerSpecificProposal(@Nonnull final InetSocketAddress address, @Nonnull final TlvsBuilder openBuilder) { - Preconditions.checkNotNull(address); + requireNonNull(address); final LspDbVersion lspDbVersion = new LspDbVersionBuilder().setLspDbVersionValue(this.dbVersion).build(); openBuilder.addAugmentation(Tlvs3.class, new Tlvs3Builder().setLspDbVersion(lspDbVersion).build()); } diff --git a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCReconnectPromise.java b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCReconnectPromise.java index b30fccc48c..f912f214e6 100755 --- a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCReconnectPromise.java +++ b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCReconnectPromise.java @@ -8,7 +8,8 @@ package org.opendaylight.protocol.pcep.pcc.mock.protocol; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import io.netty.bootstrap.Bootstrap; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFutureListener; @@ -76,7 +77,7 @@ final class PCCReconnectPromise extends DefaultPromise { } synchronized boolean isInitialConnectFinished() { - Preconditions.checkNotNull(this.pending); + requireNonNull(this.pending); return this.pending.isDone() && this.pending.isSuccess(); } diff --git a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCServerPeerProposal.java b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCServerPeerProposal.java index 05bf2efa0a..e006813904 100644 --- a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCServerPeerProposal.java +++ b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCServerPeerProposal.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.pcep.pcc.mock.protocol; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.math.BigInteger; import java.net.InetSocketAddress; import javax.annotation.Nonnull; @@ -27,7 +28,7 @@ public class PCCServerPeerProposal implements PCEPPeerProposal { @Override public void setPeerSpecificProposal(@Nonnull final InetSocketAddress address, @Nonnull final TlvsBuilder openBuilder) { - Preconditions.checkNotNull(address); + requireNonNull(address); final LspDbVersionBuilder lspDbVersionBuilder = new LspDbVersionBuilder(); if (this.isAfterReconnection) { lspDbVersionBuilder.setLspDbVersionValue(this.dbVersion); diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParser.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParser.java index 5eff636063..2edddd63be 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParser.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParser.java @@ -7,8 +7,9 @@ */ package org.opendaylight.protocol.pcep.spi; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Optional; -import com.google.common.base.Preconditions; import com.google.common.primitives.UnsignedBytes; import io.netty.buffer.ByteBuf; import java.util.ArrayList; @@ -49,7 +50,7 @@ public abstract class AbstractMessageParser implements MessageParser, MessageSer private final ObjectRegistry registry; protected AbstractMessageParser(final ObjectRegistry registry) { - this.registry = Preconditions.checkNotNull(registry); + this.registry = requireNonNull(registry); } /** @@ -122,7 +123,7 @@ public abstract class AbstractMessageParser implements MessageParser, MessageSer @Override public final Message parseMessage(final ByteBuf buffer, final List errors) throws PCEPDeserializerException { - Preconditions.checkNotNull(buffer, "Buffer may not be null"); + requireNonNull(buffer, "Buffer may not be null"); // Parse objects first final List objs = parseObjects(buffer); diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractObjectWithTlvsParser.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractObjectWithTlvsParser.java index 3b5768716b..a074405631 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractObjectWithTlvsParser.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/AbstractObjectWithTlvsParser.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.pcep.spi; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; @@ -28,8 +30,8 @@ public abstract class AbstractObjectWithTlvsParser implements ObjectParser, O private final VendorInformationTlvRegistry viTlvReg; protected AbstractObjectWithTlvsParser(final TlvRegistry tlvReg, final VendorInformationTlvRegistry viTlvReg) { - this.tlvReg = Preconditions.checkNotNull(tlvReg); - this.viTlvReg = Preconditions.checkNotNull(viTlvReg); + this.tlvReg = requireNonNull(tlvReg); + this.viTlvReg = requireNonNull(viTlvReg); } protected final void parseTlvs(final T builder, final ByteBuf bytes) throws PCEPDeserializerException { @@ -68,7 +70,7 @@ public abstract class AbstractObjectWithTlvsParser implements ObjectParser, O } protected final void serializeTlv(final Tlv tlv, final ByteBuf buffer) { - Preconditions.checkNotNull(tlv, "PCEP TLV is mandatory."); + requireNonNull(tlv, "PCEP TLV is mandatory."); LOG.trace("Serializing PCEP TLV {}", tlv); this.tlvReg.serializeTlv(tlv, buffer); LOG.trace("Serialized PCEP TLV : {}.", ByteBufUtil.hexDump(buffer)); diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/UnknownObject.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/UnknownObject.java index de9de6f6e3..3f701b03b3 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/UnknownObject.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/UnknownObject.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.pcep.spi; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.util.Collections; import java.util.List; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.Object; @@ -30,7 +31,7 @@ public final class UnknownObject implements Object { } public UnknownObject(final PCEPErrors error, final Object invalidObject) { - this.e = Preconditions.checkNotNull(error); + this.e = requireNonNull(error); this.error = new ErrorsBuilder().setErrorObject( new ErrorObjectBuilder().setType(error.getErrorType()).setValue( diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/AbstractPCEPExtensionProviderActivator.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/AbstractPCEPExtensionProviderActivator.java index 0e65358caf..5991ec6891 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/AbstractPCEPExtensionProviderActivator.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/AbstractPCEPExtensionProviderActivator.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.pcep.spi.pojo; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import java.util.List; import javax.annotation.concurrent.GuardedBy; @@ -28,7 +30,7 @@ public abstract class AbstractPCEPExtensionProviderActivator implements AutoClos public final synchronized void start(final PCEPExtensionProviderContext context) { Preconditions.checkState(this.registrations == null); - this.registrations = Preconditions.checkNotNull(startImpl(context)); + this.registrations = requireNonNull(startImpl(context)); } @Override diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimplePCEPExtensionProviderContextActivator.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimplePCEPExtensionProviderContextActivator.java index 4c67b8e9f5..5d02a17d95 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimplePCEPExtensionProviderContextActivator.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimplePCEPExtensionProviderContextActivator.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.pcep.spi.pojo; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.util.List; import org.opendaylight.protocol.pcep.spi.PCEPExtensionProviderActivator; import org.opendaylight.protocol.pcep.spi.PCEPExtensionProviderContext; @@ -27,8 +28,8 @@ public class SimplePCEPExtensionProviderContextActivator implements AutoCloseabl public SimplePCEPExtensionProviderContextActivator(final PCEPExtensionProviderContext providerContext, final List extensionActivators) { - this.providerContext = Preconditions.checkNotNull(providerContext); - this.extensionActivators = Preconditions.checkNotNull(extensionActivators); + this.providerContext = requireNonNull(providerContext); + this.extensionActivators = requireNonNull(extensionActivators); } public void start() { diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java index 01e3adb0b5..605b15b771 100755 --- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java +++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java @@ -7,6 +7,8 @@ */ package org.opendaylight.bgpcep.pcep.topology.provider; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.FutureCallback; @@ -77,7 +79,7 @@ public abstract class AbstractTopologySessionListener implements TopologyS private final WriteTransaction trans; private MessageContext(final WriteTransaction trans) { - this.trans = Preconditions.checkNotNull(trans); + this.trans = requireNonNull(trans); } void resolveRequest(final PCEPRequest req) { @@ -131,7 +133,7 @@ public abstract class AbstractTopologySessionListener implements TopologyS private final SessionListenerState listenerState; protected AbstractTopologySessionListener(final ServerSessionManager serverSessionManager) { - this.serverSessionManager = Preconditions.checkNotNull(serverSessionManager); + this.serverSessionManager = requireNonNull(serverSessionManager); this.listenerState = new SessionListenerState(); } @@ -256,7 +258,7 @@ public abstract class AbstractTopologySessionListener implements TopologyS */ @GuardedBy("this") private synchronized void tearDown(final PCEPSession session) { - Preconditions.checkNotNull(session); + requireNonNull(session); this.serverSessionManager.releaseNodeState(this.nodeState, session, isLspDbPersisted()); this.nodeState = null; try { @@ -577,7 +579,7 @@ public abstract class AbstractTopologySessionListener implements TopologyS protected abstract boolean onMessage(MessageContext ctx, Message message); protected final String lookupLspName(final L id) { - Preconditions.checkNotNull(id, "ID parameter null."); + requireNonNull(id, "ID parameter null."); return this.lsps.get(id); } diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPStatefulPeerProposal.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPStatefulPeerProposal.java index 97341410ba..28656e36ee 100644 --- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPStatefulPeerProposal.java +++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPStatefulPeerProposal.java @@ -8,8 +8,9 @@ package org.opendaylight.bgpcep.pcep.topology.provider; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Optional; -import com.google.common.base.Preconditions; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -42,8 +43,8 @@ public final class PCEPStatefulPeerProposal { private final InstanceIdentifier topologyId; private PCEPStatefulPeerProposal(final DataBroker dataBroker, final InstanceIdentifier topologyId) { - this.dataBroker = Preconditions.checkNotNull(dataBroker); - this.topologyId = Preconditions.checkNotNull(topologyId); + this.dataBroker = requireNonNull(dataBroker); + this.topologyId = requireNonNull(topologyId); } public static PCEPStatefulPeerProposal createStatefulPeerProposal(final DataBroker dataBroker, diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyProvider.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyProvider.java index 6ab46472d9..626b5d134d 100755 --- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyProvider.java +++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTopologyProvider.java @@ -8,9 +8,9 @@ package org.opendaylight.bgpcep.pcep.topology.provider; import static com.google.common.base.Preconditions.checkArgument; +import static java.util.Objects.requireNonNull; import com.google.common.base.Optional; -import com.google.common.base.Preconditions; import com.google.common.util.concurrent.ListenableFuture; import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; @@ -86,22 +86,22 @@ public final class PCEPTopologyProvider extends DefaultTopologyReference { final InstanceIdentifier topology, final ServerSessionManager manager, final InstructionScheduler scheduler) { super(topology); - this.dependenciesProvider = Preconditions.checkNotNull(dependenciesProvider); + this.dependenciesProvider = requireNonNull(dependenciesProvider); this.address = address; - this.topology = Preconditions.checkNotNull(topology); + this.topology = requireNonNull(topology); this.keys = keys; - this.manager = Preconditions.checkNotNull(manager); + this.manager = requireNonNull(manager); this.scheduler = scheduler; } public void instantiateServiceInstance() { final RpcProviderRegistry rpcRegistry = this.dependenciesProvider.getRpcProviderRegistry(); - this.element = Preconditions.checkNotNull(rpcRegistry + this.element = requireNonNull(rpcRegistry .addRoutedRpcImplementation(NetworkTopologyPcepService.class, new TopologyRPCs(this.manager))); this.element.registerPath(NetworkTopologyContext.class, this.topology); - this.network = Preconditions.checkNotNull(rpcRegistry + this.network = requireNonNull(rpcRegistry .addRoutedRpcImplementation(NetworkTopologyPcepProgrammingService.class, new TopologyProgramming(this.scheduler, this.manager))); this.network.registerPath(NetworkTopologyContext.class, this.topology); diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java index e9d7f37f95..c5354d561d 100755 --- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java +++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/ServerSessionManager.java @@ -8,7 +8,7 @@ package org.opendaylight.bgpcep.pcep.topology.provider; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -77,9 +77,9 @@ final class ServerSessionManager implements PCEPSessionListenerFactory, Topology public ServerSessionManager(final DataBroker broker, final InstanceIdentifier topology, final TopologySessionListenerFactory listenerFactory, final short rpcTimeout) { - this.broker = Preconditions.checkNotNull(broker); - this.topology = Preconditions.checkNotNull(topology); - this.listenerFactory = Preconditions.checkNotNull(listenerFactory); + this.broker = requireNonNull(broker); + this.topology = requireNonNull(topology); + this.listenerFactory = requireNonNull(listenerFactory); this.peerProposal = PCEPStatefulPeerProposal.createStatefulPeerProposal(this.broker, this.topology); this.rpcTimeout = rpcTimeout; } @@ -249,7 +249,7 @@ final class ServerSessionManager implements PCEPSessionListenerFactory, Topology @Override public void setPeerSpecificProposal(final InetSocketAddress address, final TlvsBuilder openBuilder) { - Preconditions.checkNotNull(address); + requireNonNull(address); this.peerProposal.setPeerProposal(createNodeId(address.getAddress()), openBuilder); } diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/SessionListenerState.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/SessionListenerState.java index 340cde0438..318c146329 100644 --- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/SessionListenerState.java +++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/SessionListenerState.java @@ -8,7 +8,8 @@ package org.opendaylight.bgpcep.pcep.topology.provider; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Stopwatch; import java.util.concurrent.TimeUnit; import org.opendaylight.controller.config.yang.pcep.topology.provider.ErrorMessages; @@ -48,7 +49,7 @@ final class SessionListenerState { } public void init(final PCEPSession session) { - Preconditions.checkNotNull(session); + requireNonNull(session); this.localPref = getLocalPref(session.getLocalPref()); this.peerPref = getPeerPref(session.getPeerPref()); this.sessionUpDuration.start(); @@ -79,7 +80,7 @@ final class SessionListenerState { } public void resetStats(final PCEPSession session) { - Preconditions.checkNotNull(session); + requireNonNull(session); this.receivedRptMsgCount = 0; this.sentInitMsgCount = 0; this.sentUpdMsgCount = 0; @@ -108,7 +109,7 @@ final class SessionListenerState { } public SessionState getSessionState(final PCEPSession session) { - Preconditions.checkNotNull(session); + requireNonNull(session); final SessionState state = new SessionState(); state.setLocalPref(this.localPref); state.setPeerPref(this.peerPref); @@ -118,7 +119,7 @@ final class SessionListenerState { } public void setPeerCapabilities(final PeerCapabilities capabilities) { - this.capa = Preconditions.checkNotNull(capabilities); + this.capa = requireNonNull(capabilities); } public void updateLastReceivedRptMsg() { diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java index 8dbf3dde9b..6bd3308f79 100644 --- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java +++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListener.java @@ -7,6 +7,8 @@ */ package org.opendaylight.bgpcep.pcep.topology.provider; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.base.Preconditions; @@ -588,7 +590,7 @@ class Stateful07TopologySessionListener extends AbstractTopologySessionListener< private ListenableFuture redelegate(final Lsp reportedLsp, final Srp srp, final Lsp lsp, final UpdateLspArgs input) { // the D bit that was reported decides the type of PCE message sent - Preconditions.checkNotNull(reportedLsp.isDelegate()); + requireNonNull(reportedLsp.isDelegate()); final Message msg; if (reportedLsp.isDelegate()) { // we already have delegation, send update diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/SyncOptimization.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/SyncOptimization.java index 9ded8bc553..bd22cf4370 100644 --- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/SyncOptimization.java +++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/SyncOptimization.java @@ -8,7 +8,8 @@ package org.opendaylight.bgpcep.pcep.topology.provider; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import org.opendaylight.protocol.pcep.PCEPSession; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Stateful1; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs3; @@ -26,7 +27,7 @@ final class SyncOptimization { private final boolean isTriggeredReSyncEnable; public SyncOptimization(final PCEPSession session) { - Preconditions.checkNotNull(session); + requireNonNull(session); final Tlvs remote = session.getRemoteTlvs(); final Tlvs local = session.localSessionCharacteristics(); final LspDbVersion localLspDbVersion = getLspDbVersion(local); diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyProgramming.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyProgramming.java index 26b878e4cb..931299328f 100644 --- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyProgramming.java +++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyProgramming.java @@ -7,6 +7,8 @@ */ package org.opendaylight.bgpcep.pcep.topology.provider; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -41,8 +43,8 @@ final class TopologyProgramming implements NetworkTopologyPcepProgrammingService private final ServerSessionManager manager; TopologyProgramming(final InstructionScheduler scheduler, final ServerSessionManager manager) { - this.scheduler = Preconditions.checkNotNull(scheduler); - this.manager = Preconditions.checkNotNull(manager); + this.scheduler = requireNonNull(scheduler); + this.manager = requireNonNull(manager); } @Override diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyRPCs.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyRPCs.java index 383f1709cf..56d9ab7c70 100644 --- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyRPCs.java +++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyRPCs.java @@ -7,6 +7,8 @@ */ package org.opendaylight.bgpcep.pcep.topology.provider; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.Futures; @@ -35,7 +37,7 @@ final class TopologyRPCs implements NetworkTopologyPcepService { private final ServerSessionManager manager; TopologyRPCs(final ServerSessionManager manager) { - this.manager = Preconditions.checkNotNull(manager); + this.manager = requireNonNull(manager); } @Override diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyDeployerImpl.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyDeployerImpl.java index b7575cd6cb..440be3dccf 100644 --- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyDeployerImpl.java +++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyDeployerImpl.java @@ -7,6 +7,8 @@ */ package org.opendaylight.bgpcep.pcep.topology.provider.config; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Optional; import com.google.common.base.Preconditions; import java.net.InetSocketAddress; @@ -33,7 +35,7 @@ public class PCEPTopologyDeployerImpl implements PCEPTopologyDeployer, AutoClose private final BlueprintContainer container; public PCEPTopologyDeployerImpl(final BlueprintContainer container) { - this.container = Preconditions.checkNotNull(container); + this.container = requireNonNull(container); } @Override diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyProviderBean.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyProviderBean.java index dfd698bb67..68ca6d1523 100644 --- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyProviderBean.java +++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/config/PCEPTopologyProviderBean.java @@ -7,6 +7,8 @@ */ package org.opendaylight.bgpcep.pcep.topology.provider.config; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -48,12 +50,12 @@ public final class PCEPTopologyProviderBean implements PCEPTopologyProviderDepen public PCEPTopologyProviderBean(final ClusterSingletonServiceProvider cssp, final BundleContext bundleContext, final DataBroker dataBroker, final PCEPDispatcher pcepDispatcher, final RpcProviderRegistry rpcProviderRegistry, final TopologySessionListenerFactory sessionListenerFactory) { - this.cssp = Preconditions.checkNotNull(cssp); - this.bundleContext = Preconditions.checkNotNull(bundleContext); - this.pcepDispatcher = Preconditions.checkNotNull(pcepDispatcher); - this.dataBroker = Preconditions.checkNotNull(dataBroker); - this.sessionListenerFactory = Preconditions.checkNotNull(sessionListenerFactory); - this.rpcProviderRegistry = Preconditions.checkNotNull(rpcProviderRegistry); + this.cssp = requireNonNull(cssp); + this.bundleContext = requireNonNull(bundleContext); + this.pcepDispatcher = requireNonNull(pcepDispatcher); + this.dataBroker = requireNonNull(dataBroker); + this.sessionListenerFactory = requireNonNull(sessionListenerFactory); + this.rpcProviderRegistry = requireNonNull(rpcProviderRegistry); final List capabilities = this.pcepDispatcher.getPCEPSessionNegotiatorFactory() .getPCEPSessionProposalFactory().getCapabilities(); final boolean statefulCapability = capabilities.stream().anyMatch(PCEPCapability::isStateful); diff --git a/pcep/topology-spi/src/main/java/org/opendaylight/bgpcep/pcep/topology/spi/AbstractInstructionExecutor.java b/pcep/topology-spi/src/main/java/org/opendaylight/bgpcep/pcep/topology/spi/AbstractInstructionExecutor.java index f3c6aac084..60016514f3 100644 --- a/pcep/topology-spi/src/main/java/org/opendaylight/bgpcep/pcep/topology/spi/AbstractInstructionExecutor.java +++ b/pcep/topology-spi/src/main/java/org/opendaylight/bgpcep/pcep/topology/spi/AbstractInstructionExecutor.java @@ -7,7 +7,8 @@ */ package org.opendaylight.bgpcep.pcep.topology.spi; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -62,7 +63,7 @@ public abstract class AbstractInstructionExecutor implements FutureCallback tii; TpReader(final ReadTransaction t, final InstanceIdentifier topo, final TpReference ref) { - this.t = Preconditions.checkNotNull(t); + this.t = requireNonNull(t); this.nii = topo.child(Node.class, new NodeKey(ref.getNode())); this.tii = this.nii.child(TerminationPoint.class, new TerminationPointKey(ref.getTp())); @@ -114,14 +116,14 @@ final class CreateTunnelInstructionExecutor extends AbstractInstructionExecutor private AddLspInput createAddLspInput(final ReadOnlyTransaction transaction) { final InstanceIdentifier tii = TopologyProgrammingUtil.topologyForInput(this.p2pTunnelInput); final TpReader dr = new TpReader(transaction, tii, this.p2pTunnelInput.getDestination()); - final TerminationPoint dp = Preconditions.checkNotNull(dr.getTp()); + final TerminationPoint dp = requireNonNull(dr.getTp()); final TpReader sr = new TpReader(transaction, tii, this.p2pTunnelInput.getSource()); - final TerminationPoint sp = Preconditions.checkNotNull(sr.getTp()); + final TerminationPoint sp = requireNonNull(sr.getTp()); - final Node sn = Preconditions.checkNotNull(sr.getNode()); + final Node sn = requireNonNull(sr.getNode()); final AddLspInputBuilder ab = new AddLspInputBuilder(); - ab.setNode(Preconditions.checkNotNull(TunelProgrammingUtil.supportingNode(sn))); + ab.setNode(requireNonNull(TunelProgrammingUtil.supportingNode(sn))); ab.setName(this.p2pTunnelInput.getSymbolicPathName()); checkLinkIsnotExistent(tii, ab, transaction); @@ -161,8 +163,8 @@ final class CreateTunnelInstructionExecutor extends AbstractInstructionExecutor private static AddressFamily buildAddressFamily(final TerminationPoint sp, final TerminationPoint dp) { // We need the IGP augmentation -- it has IP addresses - final TerminationPoint1 sp1 = Preconditions.checkNotNull(sp.getAugmentation(TerminationPoint1.class)); - final TerminationPoint1 dp1 = Preconditions.checkNotNull(dp.getAugmentation(TerminationPoint1.class)); + final TerminationPoint1 sp1 = requireNonNull(sp.getAugmentation(TerminationPoint1.class)); + final TerminationPoint1 dp1 = requireNonNull(dp.getAugmentation(TerminationPoint1.class)); // Get the types final TerminationPointType spt = sp1.getIgpTerminationPointAttributes().getTerminationPointType(); diff --git a/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/NodeChangedListener.java b/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/NodeChangedListener.java index 50db2fb71c..8f66beba1a 100644 --- a/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/NodeChangedListener.java +++ b/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/NodeChangedListener.java @@ -7,6 +7,8 @@ */ package org.opendaylight.bgpcep.pcep.tunnel.provider; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; @@ -83,9 +85,9 @@ public final class NodeChangedListener implements ClusteredDataTreeChangeListene private final TopologyId source; NodeChangedListener(final DataBroker dataProvider, final TopologyId source, final InstanceIdentifier target) { - this.dataProvider = Preconditions.checkNotNull(dataProvider); - this.target = Preconditions.checkNotNull(target); - this.source = Preconditions.checkNotNull(source); + this.dataProvider = requireNonNull(dataProvider); + this.target = requireNonNull(target); + this.source = requireNonNull(source); } private static void categorizeIdentifier(final InstanceIdentifier i, final Set> changedLsps, diff --git a/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/PCEPTunnelTopologyProvider.java b/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/PCEPTunnelTopologyProvider.java index 6d178c798a..b9518cf811 100644 --- a/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/PCEPTunnelTopologyProvider.java +++ b/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/PCEPTunnelTopologyProvider.java @@ -7,7 +7,8 @@ */ package org.opendaylight.bgpcep.pcep.tunnel.provider; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import org.opendaylight.bgpcep.topology.DefaultTopologyReference; import org.opendaylight.bgpcep.topology.TopologyReference; import org.opendaylight.controller.md.sal.binding.api.DataBroker; @@ -27,7 +28,7 @@ public final class PCEPTunnelTopologyProvider implements AutoCloseable { private PCEPTunnelTopologyProvider(final InstanceIdentifier dst, final ListenerRegistration reg) { this.ref = new DefaultTopologyReference(dst); - this.reg = Preconditions.checkNotNull(reg); + this.reg = requireNonNull(reg); } public static PCEPTunnelTopologyProvider create(final DataBroker dataProvider, diff --git a/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgramming.java b/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgramming.java index d20a1f7b69..9931cf5c1c 100644 --- a/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgramming.java +++ b/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgramming.java @@ -7,7 +7,8 @@ */ package org.opendaylight.bgpcep.pcep.tunnel.provider; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import org.opendaylight.bgpcep.pcep.topology.spi.AbstractInstructionExecutor; @@ -36,9 +37,9 @@ public final class TunnelProgramming implements TopologyTunnelPcepProgrammingSer private final InstructionScheduler scheduler; public TunnelProgramming(final InstructionScheduler scheduler, final DataBroker dataProvider, final NetworkTopologyPcepService topologyService) { - this.scheduler = Preconditions.checkNotNull(scheduler); - this.dataProvider = Preconditions.checkNotNull(dataProvider); - this.topologyService = Preconditions.checkNotNull(topologyService); + this.scheduler = requireNonNull(scheduler); + this.dataProvider = requireNonNull(dataProvider); + this.topologyService = requireNonNull(topologyService); } @Override diff --git a/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/UpdateTunnelInstructionExecutor.java b/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/UpdateTunnelInstructionExecutor.java index 5148c7e430..acccbbc169 100644 --- a/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/UpdateTunnelInstructionExecutor.java +++ b/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/UpdateTunnelInstructionExecutor.java @@ -8,7 +8,8 @@ package org.opendaylight.bgpcep.pcep.tunnel.provider; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; @@ -81,7 +82,7 @@ final class UpdateTunnelInstructionExecutor extends AbstractInstructionExecutor private UpdateLspInput buildUpdateInput(final Link link, final Node node) { final UpdateLspInputBuilder ab = new UpdateLspInputBuilder(); ab.setName(link.getAugmentation(Link1.class).getSymbolicPathName()); - ab.setNode(Preconditions.checkNotNull(TunelProgrammingUtil.supportingNode(node))); + ab.setNode(requireNonNull(TunelProgrammingUtil.supportingNode(node))); final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.update.lsp.args.ArgumentsBuilder args = new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev131024.update.lsp.args.ArgumentsBuilder(); diff --git a/programming/impl/src/main/java/org/opendaylight/bgpcep/programming/impl/InstructionDeployerImpl.java b/programming/impl/src/main/java/org/opendaylight/bgpcep/programming/impl/InstructionDeployerImpl.java index 4e16d4b851..921e725362 100644 --- a/programming/impl/src/main/java/org/opendaylight/bgpcep/programming/impl/InstructionDeployerImpl.java +++ b/programming/impl/src/main/java/org/opendaylight/bgpcep/programming/impl/InstructionDeployerImpl.java @@ -7,8 +7,9 @@ */ package org.opendaylight.bgpcep.programming.impl; +import static java.util.Objects.requireNonNull; + import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; @@ -112,12 +113,12 @@ public final class InstructionDeployerImpl implements IntructionDeployer, public InstructionDeployerImpl(final DataBroker dataProvider, final RpcProviderRegistry rpcProviderRegistry, final NotificationPublishService notifs, final Timer timer, final ClusterSingletonServiceProvider cssp, final BundleContext bundleContext) { - this.dataProvider = Preconditions.checkNotNull(dataProvider); - this.notifs = Preconditions.checkNotNull(notifs); - this.timer = Preconditions.checkNotNull(timer); - this.rpcProviderRegistry = Preconditions.checkNotNull(rpcProviderRegistry); - this.bundleContext = Preconditions.checkNotNull(bundleContext); - this.cssp = Preconditions.checkNotNull(cssp); + this.dataProvider = requireNonNull(dataProvider); + this.notifs = requireNonNull(notifs); + this.timer = requireNonNull(timer); + this.rpcProviderRegistry = requireNonNull(rpcProviderRegistry); + this.bundleContext = requireNonNull(bundleContext); + this.cssp = requireNonNull(cssp); this.iid = InstanceIdentifier.create(OdlProgramming.class); final WriteTransaction wTx = dataProvider.newWriteOnlyTransaction(); diff --git a/programming/impl/src/main/java/org/opendaylight/bgpcep/programming/impl/InstructionImpl.java b/programming/impl/src/main/java/org/opendaylight/bgpcep/programming/impl/InstructionImpl.java index d56970c2ac..1d12bb33eb 100644 --- a/programming/impl/src/main/java/org/opendaylight/bgpcep/programming/impl/InstructionImpl.java +++ b/programming/impl/src/main/java/org/opendaylight/bgpcep/programming/impl/InstructionImpl.java @@ -7,6 +7,8 @@ */ package org.opendaylight.bgpcep.programming.impl; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; @@ -41,11 +43,11 @@ final class InstructionImpl implements Instruction { InstructionImpl(final QueueInstruction queue, final SettableFuture future, final InstructionId id, final List dependencies, final Timeout timeout) { - this.schedulingFuture = Preconditions.checkNotNull(future); - this.dependencies = Preconditions.checkNotNull(dependencies); - this.timeout = Preconditions.checkNotNull(timeout); - this.queue = Preconditions.checkNotNull(queue); - this.id = Preconditions.checkNotNull(id); + this.schedulingFuture = requireNonNull(future); + this.dependencies = requireNonNull(dependencies); + this.timeout = requireNonNull(timeout); + this.queue = requireNonNull(queue); + this.id = requireNonNull(id); } InstructionId getId() { diff --git a/programming/impl/src/main/java/org/opendaylight/bgpcep/programming/impl/ProgrammingServiceImpl.java b/programming/impl/src/main/java/org/opendaylight/bgpcep/programming/impl/ProgrammingServiceImpl.java index 5839f21481..a090ff379b 100644 --- a/programming/impl/src/main/java/org/opendaylight/bgpcep/programming/impl/ProgrammingServiceImpl.java +++ b/programming/impl/src/main/java/org/opendaylight/bgpcep/programming/impl/ProgrammingServiceImpl.java @@ -7,7 +7,8 @@ */ package org.opendaylight.bgpcep.programming.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -156,12 +157,12 @@ public final class ProgrammingServiceImpl implements AutoCloseable, ClusterSingl final ListeningExecutorService executor, final RpcProviderRegistry rpcProviderRegistry, final ClusterSingletonServiceProvider cssp, final Timer timer, final String instructionId, final WriteConfiguration writeConfiguration) { - this.dataProvider = Preconditions.checkNotNull(dataProvider); - this.instructionId = Preconditions.checkNotNull(instructionId); - this.notifs = Preconditions.checkNotNull(notifs); - this.executor = Preconditions.checkNotNull(executor); - this.rpcProviderRegistry = Preconditions.checkNotNull(rpcProviderRegistry); - this.timer = Preconditions.checkNotNull(timer); + this.dataProvider = requireNonNull(dataProvider); + this.instructionId = requireNonNull(instructionId); + this.notifs = requireNonNull(notifs); + this.executor = requireNonNull(executor); + this.rpcProviderRegistry = requireNonNull(rpcProviderRegistry); + this.timer = requireNonNull(timer); this.qid = KeyedInstanceIdentifier.builder(InstructionsQueue.class, new InstructionsQueueKey(this.instructionId)).build(); this.writeConfiguration = writeConfiguration; diff --git a/programming/topology-api/src/main/java/org/opendaylight/bgpcep/programming/topology/TopologyProgrammingUtil.java b/programming/topology-api/src/main/java/org/opendaylight/bgpcep/programming/topology/TopologyProgrammingUtil.java index 30564b2c28..0432cfc8b3 100644 --- a/programming/topology-api/src/main/java/org/opendaylight/bgpcep/programming/topology/TopologyProgrammingUtil.java +++ b/programming/topology-api/src/main/java/org/opendaylight/bgpcep/programming/topology/TopologyProgrammingUtil.java @@ -7,7 +7,8 @@ */ package org.opendaylight.bgpcep.programming.topology; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.programming.rev131102.TopologyInstructionInput; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; @@ -23,7 +24,7 @@ public final class TopologyProgrammingUtil { @SuppressWarnings("unchecked") public static InstanceIdentifier topologyForInput(final TopologyInstructionInput input) { - Preconditions.checkNotNull(input.getNetworkTopologyRef()); + requireNonNull(input.getNetworkTopologyRef()); return (InstanceIdentifier) input.getNetworkTopologyRef().getValue(); } } diff --git a/programming/tunnel-api/src/main/java/org/opendaylight/bgpcep/programming/tunnel/TunnelProgrammingUtil.java b/programming/tunnel-api/src/main/java/org/opendaylight/bgpcep/programming/tunnel/TunnelProgrammingUtil.java index 5507053009..9adf951896 100644 --- a/programming/tunnel-api/src/main/java/org/opendaylight/bgpcep/programming/tunnel/TunnelProgrammingUtil.java +++ b/programming/tunnel-api/src/main/java/org/opendaylight/bgpcep/programming/tunnel/TunnelProgrammingUtil.java @@ -7,7 +7,8 @@ */ package org.opendaylight.bgpcep.programming.tunnel; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.tunnel.programming.rev130930.BaseTunnelInput; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Link; @@ -23,7 +24,7 @@ public final class TunnelProgrammingUtil { } public static InstanceIdentifier linkIdentifier(final InstanceIdentifier topology, final BaseTunnelInput input) { - Preconditions.checkNotNull(input.getLinkId()); + requireNonNull(input.getLinkId()); return topology.child(Link.class, new LinkKey(input.getLinkId())); } } diff --git a/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/subobject/ero/EROLabelSubobjectParser.java b/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/subobject/ero/EROLabelSubobjectParser.java index ba19008261..2db8811407 100644 --- a/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/subobject/ero/EROLabelSubobjectParser.java +++ b/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/subobject/ero/EROLabelSubobjectParser.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.rsvp.parser.impl.subobject.ero; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -41,7 +43,7 @@ public class EROLabelSubobjectParser implements EROSubobjectParser, EROSubobject private final LabelRegistry registry; public EROLabelSubobjectParser(final LabelRegistry labelReg) { - this.registry = Preconditions.checkNotNull(labelReg); + this.registry = requireNonNull(labelReg); } @Override diff --git a/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/subobject/rro/RROLabelSubobjectParser.java b/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/subobject/rro/RROLabelSubobjectParser.java index 3049920d24..05919b4ba5 100644 --- a/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/subobject/rro/RROLabelSubobjectParser.java +++ b/rsvp/impl/src/main/java/org/opendaylight/protocol/rsvp/parser/impl/subobject/rro/RROLabelSubobjectParser.java @@ -8,6 +8,8 @@ package org.opendaylight.protocol.rsvp.parser.impl.subobject.rro; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -42,7 +44,7 @@ public class RROLabelSubobjectParser implements RROSubobjectParser, RROSubobject private final LabelRegistry registry; public RROLabelSubobjectParser(final LabelRegistry labelReg) { - this.registry = Preconditions.checkNotNull(labelReg); + this.registry = requireNonNull(labelReg); } @Override @@ -69,7 +71,7 @@ public class RROLabelSubobjectParser implements RROSubobjectParser, RROSubobject @Override public void serializeSubobject(final SubobjectContainer subobject, final ByteBuf buffer) { - Preconditions.checkNotNull(subobject.getSubobjectType(), "Subobject type cannot be empty."); + requireNonNull(subobject.getSubobjectType(), "Subobject type cannot be empty."); final Label label = ((LabelCase) subobject.getSubobjectType()).getLabel(); final ByteBuf body = Unpooled.buffer(); this.registry.serializeLabel(label.isUniDirectional(), label.isGlobal(), label.getLabelType(), body); diff --git a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/AbstractRSVPExtensionProviderActivator.java b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/AbstractRSVPExtensionProviderActivator.java index d9989eb648..da801497e1 100644 --- a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/AbstractRSVPExtensionProviderActivator.java +++ b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/AbstractRSVPExtensionProviderActivator.java @@ -8,6 +8,8 @@ package org.opendaylight.protocol.rsvp.parser.spi; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import java.util.List; import javax.annotation.concurrent.GuardedBy; @@ -27,7 +29,7 @@ public abstract class AbstractRSVPExtensionProviderActivator implements AutoClos public final synchronized void start(final RSVPExtensionProviderContext context) { Preconditions.checkState(this.registrations == null); - this.registrations = Preconditions.checkNotNull(startImpl(context)); + this.registrations = requireNonNull(startImpl(context)); } @Override diff --git a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRSVPExtensionProviderContextActivator.java b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRSVPExtensionProviderContextActivator.java index 120083cbee..b8525df031 100644 --- a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRSVPExtensionProviderContextActivator.java +++ b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRSVPExtensionProviderContextActivator.java @@ -7,7 +7,8 @@ */ package org.opendaylight.protocol.rsvp.parser.spi.pojo; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.util.List; import org.opendaylight.protocol.rsvp.parser.spi.RSVPExtensionProviderActivator; import org.opendaylight.protocol.rsvp.parser.spi.RSVPExtensionProviderContext; @@ -27,8 +28,8 @@ public class SimpleRSVPExtensionProviderContextActivator implements AutoCloseabl public SimpleRSVPExtensionProviderContextActivator(final RSVPExtensionProviderContext providerContext, final List extensionActivators) { - this.providerContext = Preconditions.checkNotNull(providerContext); - this.extensionActivators = Preconditions.checkNotNull(extensionActivators); + this.providerContext = requireNonNull(providerContext); + this.extensionActivators = requireNonNull(extensionActivators); } public void start() { diff --git a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/EROSubobjectListParser.java b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/EROSubobjectListParser.java index 80d7f92fec..9440e3e3b3 100644 --- a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/EROSubobjectListParser.java +++ b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/EROSubobjectListParser.java @@ -8,6 +8,8 @@ package org.opendaylight.protocol.rsvp.parser.spi.subobjects; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; @@ -27,7 +29,7 @@ public abstract class EROSubobjectListParser extends AbstractRSVPObjectParser { private final EROSubobjectRegistry subobjReg; public EROSubobjectListParser(final EROSubobjectRegistry subobjReg) { - this.subobjReg = Preconditions.checkNotNull(subobjReg); + this.subobjReg = requireNonNull(subobjReg); } public List parseList(final ByteBuf buffer) throws RSVPParsingException { diff --git a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/RROSubobjectListParser.java b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/RROSubobjectListParser.java index 842c6138c4..17d2519826 100644 --- a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/RROSubobjectListParser.java +++ b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/RROSubobjectListParser.java @@ -8,6 +8,8 @@ package org.opendaylight.protocol.rsvp.parser.spi.subobjects; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufUtil; @@ -25,7 +27,7 @@ public abstract class RROSubobjectListParser extends AbstractRSVPObjectParser { private final RROSubobjectRegistry subobjReg; public RROSubobjectListParser(final RROSubobjectRegistry subobjReg) { - this.subobjReg = Preconditions.checkNotNull(subobjReg); + this.subobjReg = requireNonNull(subobjReg); } public List parseList(final ByteBuf buffer) throws RSVPParsingException { diff --git a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/XROSubobjectListParser.java b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/XROSubobjectListParser.java index da5b254f6e..6fbf469063 100644 --- a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/XROSubobjectListParser.java +++ b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/subobjects/XROSubobjectListParser.java @@ -8,6 +8,8 @@ package org.opendaylight.protocol.rsvp.parser.spi.subobjects; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import com.google.common.primitives.UnsignedBytes; import io.netty.buffer.ByteBuf; @@ -27,7 +29,7 @@ public abstract class XROSubobjectListParser extends AbstractRSVPObjectParser { private final XROSubobjectRegistry subobjReg; protected XROSubobjectListParser(final XROSubobjectRegistry subobjReg) { - this.subobjReg = Preconditions.checkNotNull(subobjReg); + this.subobjReg = requireNonNull(subobjReg); } public List parseList(final ByteBuf byteBuf) throws RSVPParsingException { diff --git a/util/src/main/java/org/opendaylight/protocol/util/BitArray.java b/util/src/main/java/org/opendaylight/protocol/util/BitArray.java index b942989be8..0a62bce0d8 100644 --- a/util/src/main/java/org/opendaylight/protocol/util/BitArray.java +++ b/util/src/main/java/org/opendaylight/protocol/util/BitArray.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.util; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import com.google.common.primitives.UnsignedBytes; import io.netty.buffer.ByteBuf; @@ -39,7 +41,7 @@ public final class BitArray { } private BitArray(final byte[] backingArray, final int size) { - Preconditions.checkNotNull(backingArray, "Byte Array cannot be null"); + requireNonNull(backingArray, "Byte Array cannot be null"); this.size = size; this.backingArray = (backingArray == null) ? null : backingArray.clone(); this.offset = (calculateBytes(this.size) * Byte.SIZE) - this.size; @@ -55,7 +57,7 @@ public final class BitArray { */ public static BitArray valueOf(final ByteBuf buffer, final int size) { Preconditions.checkArgument(size >= 1, "Minimum size is 1 bit."); - Preconditions.checkNotNull(buffer, "Byte Array cannot be null"); + requireNonNull(buffer, "Byte Array cannot be null"); final byte[] b = new byte[calculateBytes(size)]; buffer.readBytes(b, 0, b.length); return new BitArray(b, size); diff --git a/util/src/main/java/org/opendaylight/protocol/util/PCEPHexDumpParser.java b/util/src/main/java/org/opendaylight/protocol/util/PCEPHexDumpParser.java index 50011e4c9c..cbcbf8c808 100644 --- a/util/src/main/java/org/opendaylight/protocol/util/PCEPHexDumpParser.java +++ b/util/src/main/java/org/opendaylight/protocol/util/PCEPHexDumpParser.java @@ -7,6 +7,8 @@ */ package org.opendaylight.protocol.util; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.io.BaseEncoding; @@ -42,7 +44,7 @@ public final class PCEPHexDumpParser { } public static List parseMessages(final InputStream is) throws IOException { - Preconditions.checkNotNull(is); + requireNonNull(is); try (InputStreamReader isr = new InputStreamReader(is, "UTF-8")) { return parseMessages(CharStreams.toString(isr)); } -- 2.36.6