From e314a29c76a5afacd84f4ef8a38b19abd0273444 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 8 Jul 2019 12:31:20 +0200 Subject: [PATCH] Modernize codebase a bit This takes a pass through usage of deprecated methods, updating them to their latest equivalents. Change-Id: I1b4f3f160dba70782765ec0b6968e6ee08ae09f5 Signed-off-by: Robert Varga --- .../FlowspecL3vpnIpv4NlriParserTest.java | 33 ++++++++++--------- .../SimpleFlowspecIpv4NlriParserTest.java | 31 ++++++++--------- .../SimpleFlowspecIpv6NlriParserTest.java | 17 +++++----- .../protocol/bgp/state/GlobalUtilTest.java | 5 ++- .../protocol/bgp/state/NeighborUtilTest.java | 9 +++-- .../protocol/bgp/state/PeerGroupUtilTest.java | 1 - .../bgp/state/StateProviderImplTest.java | 1 - .../protocol/bgp/parser/spi/PathIdUtil.java | 4 +-- .../protocol/bgp/rib/impl/RIBImpl.java | 2 +- .../bgp/rib/impl/AbstractRIBTestSetup.java | 4 +-- .../protocol/bgp/rib/impl/FSMTest.java | 4 +-- .../impl/SynchronizationAndExceptionTest.java | 10 +++--- .../bgp/rib/impl/config/RibImplTest.java | 5 ++- .../bgp/rib/spi/IdentifierUtilsTest.java | 9 +++-- .../protocol/bgp/rib/spi/RIBSupportTest.java | 6 ++-- .../bgp/rib/spi/RIBSupportTestImp.java | 8 ++--- .../bgp/rib/spi/RibSupportUtilsTest.java | 13 ++++---- ...ingletonServiceRegistrationHelperTest.java | 4 +-- .../protocol/bmp/impl/app/BmpRouterImpl.java | 4 +-- .../bmp/impl/app/BmpRouterPeerImpl.java | 4 +-- .../protocol/bmp/impl/app/TablesUtil.java | 14 ++++---- .../loader/impl/ConfigLoaderImplTest.java | 3 +- 22 files changed, 88 insertions(+), 103 deletions(-) diff --git a/bgp/extensions/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv4NlriParserTest.java b/bgp/extensions/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv4NlriParserTest.java index 39981df373..bf9226d8b5 100644 --- a/bgp/extensions/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv4NlriParserTest.java +++ b/bgp/extensions/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv4NlriParserTest.java @@ -9,6 +9,8 @@ package org.opendaylight.protocol.bgp.flowspec; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doReturn; import static org.opendaylight.bgp.concepts.RouteDistinguisherUtil.extractRouteDistinguisher; import com.google.common.collect.Lists; @@ -21,7 +23,6 @@ import java.util.Optional; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; -import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.opendaylight.protocol.bgp.flowspec.handlers.AbstractNumericOperandParser; import org.opendaylight.protocol.bgp.flowspec.handlers.AbstractOperandParser; @@ -171,8 +172,8 @@ public class FlowspecL3vpnIpv4NlriParserTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - Mockito.doReturn(Optional.of(this.muliPathSupport)).when(this.constraint).getPeerConstraint(Mockito.any()); - Mockito.doReturn(true).when(this.muliPathSupport).isTableTypeSupported(Mockito.any()); + doReturn(Optional.of(this.muliPathSupport)).when(this.constraint).getPeerConstraint(any()); + doReturn(true).when(this.muliPathSupport).isTableTypeSupported(any()); } @Test @@ -582,7 +583,7 @@ public class FlowspecL3vpnIpv4NlriParserTest { public void testExtractFlowspecDestPrefix() { final DataContainerNodeBuilder entry = Builders.mapEntryBuilder(); - entry.withNodeIdentifier(new NodeIdentifierWithPredicates(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); + entry.withNodeIdentifier(NodeIdentifierWithPredicates.of(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); entry.withChild(Builders.unkeyedListBuilder() .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_NID) .withChild(Builders.unkeyedListEntryBuilder() @@ -604,7 +605,7 @@ public class FlowspecL3vpnIpv4NlriParserTest { public void testExtractFlowspecSourcePrefix() { final DataContainerNodeBuilder entry = Builders.mapEntryBuilder(); - entry.withNodeIdentifier(new NodeIdentifierWithPredicates(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); + entry.withNodeIdentifier(NodeIdentifierWithPredicates.of(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); entry.withChild(Builders.unkeyedListBuilder() .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_NID) .withChild(Builders.unkeyedListEntryBuilder() @@ -626,7 +627,7 @@ public class FlowspecL3vpnIpv4NlriParserTest { public void testExtractFlowspecProtocolIps() { final DataContainerNodeBuilder entry = Builders.mapEntryBuilder(); - entry.withNodeIdentifier(new NodeIdentifierWithPredicates(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); + entry.withNodeIdentifier(NodeIdentifierWithPredicates.of(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); entry.withChild(Builders.unkeyedListBuilder() .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_NID) .withChild(Builders.unkeyedListEntryBuilder() @@ -671,7 +672,7 @@ public class FlowspecL3vpnIpv4NlriParserTest { public void testExtractFlowspecPorts() { final DataContainerNodeBuilder entry = Builders.mapEntryBuilder(); - entry.withNodeIdentifier(new NodeIdentifierWithPredicates(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); + entry.withNodeIdentifier(NodeIdentifierWithPredicates.of(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); entry.withChild(Builders.unkeyedListBuilder() .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_NID) .withChild(Builders.unkeyedListEntryBuilder() @@ -700,7 +701,7 @@ public class FlowspecL3vpnIpv4NlriParserTest { public void testExtractFlowspecDestinationPorts() { final DataContainerNodeBuilder entry = Builders.mapEntryBuilder(); - entry.withNodeIdentifier(new NodeIdentifierWithPredicates(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); + entry.withNodeIdentifier(NodeIdentifierWithPredicates.of(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); entry.withChild(Builders.unkeyedListBuilder() .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_NID) .withChild(Builders.unkeyedListEntryBuilder() @@ -730,7 +731,7 @@ public class FlowspecL3vpnIpv4NlriParserTest { public void testExtractFlowspecSourcePorts() { final DataContainerNodeBuilder entry = Builders.mapEntryBuilder(); - entry.withNodeIdentifier(new NodeIdentifierWithPredicates(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); + entry.withNodeIdentifier(NodeIdentifierWithPredicates.of(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); entry.withChild(Builders.unkeyedListBuilder() .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_NID) .withChild(Builders.unkeyedListEntryBuilder() @@ -762,7 +763,7 @@ public class FlowspecL3vpnIpv4NlriParserTest { public void testExtractFlowspecSourceTypes() { final DataContainerNodeBuilder entry = Builders.mapEntryBuilder(); - entry.withNodeIdentifier(new NodeIdentifierWithPredicates(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); + entry.withNodeIdentifier(NodeIdentifierWithPredicates.of(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); entry.withChild(Builders.unkeyedListBuilder() .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_NID) .withChild(Builders.unkeyedListEntryBuilder() @@ -794,7 +795,7 @@ public class FlowspecL3vpnIpv4NlriParserTest { public void testExtractFlowspecSourceCodes() { final DataContainerNodeBuilder entry = Builders.mapEntryBuilder(); - entry.withNodeIdentifier(new NodeIdentifierWithPredicates(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); + entry.withNodeIdentifier(NodeIdentifierWithPredicates.of(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); entry.withChild(Builders.unkeyedListBuilder() .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_NID) .withChild(Builders.unkeyedListEntryBuilder() @@ -822,7 +823,7 @@ public class FlowspecL3vpnIpv4NlriParserTest { public void testExtractFlowspecSourceTcpFlags() { final DataContainerNodeBuilder entry = Builders.mapEntryBuilder(); - entry.withNodeIdentifier(new NodeIdentifierWithPredicates(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); + entry.withNodeIdentifier(NodeIdentifierWithPredicates.of(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); entry.withChild(Builders.unkeyedListBuilder() .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_NID) .withChild(Builders.unkeyedListEntryBuilder() @@ -851,7 +852,7 @@ public class FlowspecL3vpnIpv4NlriParserTest { public void testExtractFlowspecPacketLengths() { final DataContainerNodeBuilder entry = Builders.mapEntryBuilder(); - entry.withNodeIdentifier(new NodeIdentifierWithPredicates(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); + entry.withNodeIdentifier(NodeIdentifierWithPredicates.of(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); entry.withChild(Builders.unkeyedListBuilder() .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_NID) .withChild(Builders.unkeyedListEntryBuilder() @@ -881,7 +882,7 @@ public class FlowspecL3vpnIpv4NlriParserTest { public void testExtractFlowspecDscps() { final DataContainerNodeBuilder entry = Builders.mapEntryBuilder(); - entry.withNodeIdentifier(new NodeIdentifierWithPredicates(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); + entry.withNodeIdentifier(NodeIdentifierWithPredicates.of(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); entry.withChild(Builders.unkeyedListBuilder() .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_NID) .withChild(Builders.unkeyedListEntryBuilder() @@ -910,7 +911,7 @@ public class FlowspecL3vpnIpv4NlriParserTest { public void testExtractFlowspecFragments() { final DataContainerNodeBuilder entry = Builders.mapEntryBuilder(); - entry.withNodeIdentifier(new NodeIdentifierWithPredicates(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); + entry.withNodeIdentifier(NodeIdentifierWithPredicates.of(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); entry.withChild(Builders.unkeyedListBuilder() .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_NID) .withChild(Builders.unkeyedListEntryBuilder() @@ -943,7 +944,7 @@ public class FlowspecL3vpnIpv4NlriParserTest { public void testExtractFlowspecRouteDistinguisher() { final DataContainerNodeBuilder entry = Builders.mapEntryBuilder(); - entry.withNodeIdentifier(new NodeIdentifierWithPredicates(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); + entry.withNodeIdentifier(NodeIdentifierWithPredicates.of(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); entry.withChild( Builders.leafBuilder() .withNodeIdentifier(RD_NID) diff --git a/bgp/extensions/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv4NlriParserTest.java b/bgp/extensions/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv4NlriParserTest.java index 7fc6e1f340..869499e772 100644 --- a/bgp/extensions/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv4NlriParserTest.java +++ b/bgp/extensions/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv4NlriParserTest.java @@ -9,6 +9,8 @@ package org.opendaylight.protocol.bgp.flowspec; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doReturn; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -20,7 +22,6 @@ import java.util.Optional; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; -import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.opendaylight.protocol.bgp.flowspec.handlers.AbstractNumericOperandParser; import org.opendaylight.protocol.bgp.flowspec.handlers.AbstractOperandParser; @@ -163,8 +164,8 @@ public class SimpleFlowspecIpv4NlriParserTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - Mockito.doReturn(Optional.of(this.muliPathSupport)).when(this.constraint).getPeerConstraint(Mockito.any()); - Mockito.doReturn(true).when(this.muliPathSupport).isTableTypeSupported(Mockito.any()); + doReturn(Optional.of(this.muliPathSupport)).when(this.constraint).getPeerConstraint(any()); + doReturn(true).when(this.muliPathSupport).isTableTypeSupported(any()); } @Test @@ -541,7 +542,7 @@ public class SimpleFlowspecIpv4NlriParserTest { public void testExtractFlowspecDestPrefix() { final DataContainerNodeBuilder entry = Builders.mapEntryBuilder(); - entry.withNodeIdentifier(new NodeIdentifierWithPredicates(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); + entry.withNodeIdentifier(NodeIdentifierWithPredicates.of(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); entry.withChild(Builders.unkeyedListBuilder() .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_NID) .withChild(Builders.unkeyedListEntryBuilder() @@ -563,7 +564,7 @@ public class SimpleFlowspecIpv4NlriParserTest { public void testExtractFlowspecSourcePrefix() { final DataContainerNodeBuilder entry = Builders.mapEntryBuilder(); - entry.withNodeIdentifier(new NodeIdentifierWithPredicates(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); + entry.withNodeIdentifier(NodeIdentifierWithPredicates.of(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); entry.withChild(Builders.unkeyedListBuilder() .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_NID) .withChild(Builders.unkeyedListEntryBuilder() @@ -585,7 +586,7 @@ public class SimpleFlowspecIpv4NlriParserTest { public void testExtractFlowspecProtocolIps() { final DataContainerNodeBuilder entry = Builders.mapEntryBuilder(); - entry.withNodeIdentifier(new NodeIdentifierWithPredicates(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); + entry.withNodeIdentifier(NodeIdentifierWithPredicates.of(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); entry.withChild(Builders.unkeyedListBuilder() .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_NID) .withChild(Builders.unkeyedListEntryBuilder() @@ -631,7 +632,7 @@ public class SimpleFlowspecIpv4NlriParserTest { public void testExtractFlowspecPorts() { final DataContainerNodeBuilder entry = Builders.mapEntryBuilder(); - entry.withNodeIdentifier(new NodeIdentifierWithPredicates(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); + entry.withNodeIdentifier(NodeIdentifierWithPredicates.of(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); entry.withChild(Builders.unkeyedListBuilder() .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_NID) .withChild(Builders.unkeyedListEntryBuilder() @@ -660,7 +661,7 @@ public class SimpleFlowspecIpv4NlriParserTest { public void testExtractFlowspecDestinationPorts() { final DataContainerNodeBuilder entry = Builders.mapEntryBuilder(); - entry.withNodeIdentifier(new NodeIdentifierWithPredicates(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); + entry.withNodeIdentifier(NodeIdentifierWithPredicates.of(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); entry.withChild(Builders.unkeyedListBuilder() .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_NID) .withChild(Builders.unkeyedListEntryBuilder() @@ -690,7 +691,7 @@ public class SimpleFlowspecIpv4NlriParserTest { public void testExtractFlowspecSourcePorts() { final DataContainerNodeBuilder entry = Builders.mapEntryBuilder(); - entry.withNodeIdentifier(new NodeIdentifierWithPredicates(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); + entry.withNodeIdentifier(NodeIdentifierWithPredicates.of(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); entry.withChild(Builders.unkeyedListBuilder() .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_NID) .withChild(Builders.unkeyedListEntryBuilder() @@ -722,7 +723,7 @@ public class SimpleFlowspecIpv4NlriParserTest { public void testExtractFlowspecSourceTypes() { final DataContainerNodeBuilder entry = Builders.mapEntryBuilder(); - entry.withNodeIdentifier(new NodeIdentifierWithPredicates(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); + entry.withNodeIdentifier(NodeIdentifierWithPredicates.of(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); entry.withChild(Builders.unkeyedListBuilder() .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_NID) .withChild(Builders.unkeyedListEntryBuilder() @@ -753,7 +754,7 @@ public class SimpleFlowspecIpv4NlriParserTest { public void testExtractFlowspecSourceCodes() { final DataContainerNodeBuilder entry = Builders.mapEntryBuilder(); - entry.withNodeIdentifier(new NodeIdentifierWithPredicates(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); + entry.withNodeIdentifier(NodeIdentifierWithPredicates.of(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); entry.withChild(Builders.unkeyedListBuilder() .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_NID) .withChild(Builders.unkeyedListEntryBuilder() @@ -781,7 +782,7 @@ public class SimpleFlowspecIpv4NlriParserTest { public void testExtractFlowspecSourceTcpFlags() { final DataContainerNodeBuilder entry = Builders.mapEntryBuilder(); - entry.withNodeIdentifier(new NodeIdentifierWithPredicates(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); + entry.withNodeIdentifier(NodeIdentifierWithPredicates.of(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); entry.withChild(Builders.unkeyedListBuilder() .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_NID) .withChild(Builders.unkeyedListEntryBuilder() @@ -810,7 +811,7 @@ public class SimpleFlowspecIpv4NlriParserTest { public void testExtractFlowspecPacketLengths() { final DataContainerNodeBuilder entry = Builders.mapEntryBuilder(); - entry.withNodeIdentifier(new NodeIdentifierWithPredicates(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); + entry.withNodeIdentifier(NodeIdentifierWithPredicates.of(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); entry.withChild(Builders.unkeyedListBuilder() .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_NID) .withChild(Builders.unkeyedListEntryBuilder() @@ -840,7 +841,7 @@ public class SimpleFlowspecIpv4NlriParserTest { public void testExtractFlowspecDscps() { final DataContainerNodeBuilder entry = Builders.mapEntryBuilder(); - entry.withNodeIdentifier(new NodeIdentifierWithPredicates(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); + entry.withNodeIdentifier(NodeIdentifierWithPredicates.of(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); entry.withChild(Builders.unkeyedListBuilder() .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_NID) .withChild(Builders.unkeyedListEntryBuilder() @@ -870,7 +871,7 @@ public class SimpleFlowspecIpv4NlriParserTest { public void testExtractFlowspecFragments() { final DataContainerNodeBuilder entry = Builders.mapEntryBuilder(); - entry.withNodeIdentifier(new NodeIdentifierWithPredicates(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); + entry.withNodeIdentifier(NodeIdentifierWithPredicates.of(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); entry.withChild(Builders.unkeyedListBuilder() .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_NID) .withChild(Builders.unkeyedListEntryBuilder() diff --git a/bgp/extensions/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv6NlriParserTest.java b/bgp/extensions/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv6NlriParserTest.java index dc2188b458..a3cb22f2fc 100644 --- a/bgp/extensions/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv6NlriParserTest.java +++ b/bgp/extensions/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv6NlriParserTest.java @@ -9,6 +9,8 @@ package org.opendaylight.protocol.bgp.flowspec; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doReturn; import static org.opendaylight.protocol.bgp.flowspec.SimpleFlowspecIpv4NlriParserTest.PATH_ID; import com.google.common.collect.Lists; @@ -21,7 +23,6 @@ import java.util.Optional; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; -import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.opendaylight.protocol.bgp.flowspec.handlers.AbstractNumericOperandParser; import org.opendaylight.protocol.bgp.flowspec.handlers.AbstractOperandParser; @@ -114,8 +115,8 @@ public class SimpleFlowspecIpv6NlriParserTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - Mockito.doReturn(Optional.of(this.muliPathSupport)).when(this.constraint).getPeerConstraint(Mockito.any()); - Mockito.doReturn(true).when(this.muliPathSupport).isTableTypeSupported(Mockito.any()); + doReturn(Optional.of(this.muliPathSupport)).when(this.constraint).getPeerConstraint(any()); + doReturn(true).when(this.muliPathSupport).isTableTypeSupported(any()); } @Test @@ -354,7 +355,7 @@ public class SimpleFlowspecIpv6NlriParserTest { public void testExtractFlowspecFragments() { final DataContainerNodeBuilder entry = Builders.mapEntryBuilder(); - entry.withNodeIdentifier(new NodeIdentifierWithPredicates(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); + entry.withNodeIdentifier(NodeIdentifierWithPredicates.of(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); entry.withChild(Builders.unkeyedListBuilder() .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_NID) .withChild(Builders.unkeyedListEntryBuilder() @@ -387,7 +388,7 @@ public class SimpleFlowspecIpv6NlriParserTest { public void testExtractFlowspecNextHeaders() { final DataContainerNodeBuilder entry = Builders.mapEntryBuilder(); - entry.withNodeIdentifier(new NodeIdentifierWithPredicates(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); + entry.withNodeIdentifier(NodeIdentifierWithPredicates.of(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); entry.withChild(Builders.unkeyedListBuilder() .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_NID) .withChild(Builders.unkeyedListEntryBuilder() @@ -432,7 +433,7 @@ public class SimpleFlowspecIpv6NlriParserTest { public void testExtractFlowspecFlowLabels() { final DataContainerNodeBuilder entry = Builders.mapEntryBuilder(); - entry.withNodeIdentifier(new NodeIdentifierWithPredicates(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); + entry.withNodeIdentifier(NodeIdentifierWithPredicates.of(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); entry.withChild(Builders.unkeyedListBuilder() .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_NID) .withChild(Builders.unkeyedListEntryBuilder() @@ -467,7 +468,7 @@ public class SimpleFlowspecIpv6NlriParserTest { public void testExtractFlowspecDestPrefix() { final DataContainerNodeBuilder entry = Builders.mapEntryBuilder(); - entry.withNodeIdentifier(new NodeIdentifierWithPredicates(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); + entry.withNodeIdentifier(NodeIdentifierWithPredicates.of(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); entry.withChild(Builders.unkeyedListBuilder() .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_NID) .withChild(Builders.unkeyedListEntryBuilder() @@ -488,7 +489,7 @@ public class SimpleFlowspecIpv6NlriParserTest { public void testExtractFlowspecSourcePrefix() { final DataContainerNodeBuilder entry = Builders.mapEntryBuilder(); - entry.withNodeIdentifier(new NodeIdentifierWithPredicates(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); + entry.withNodeIdentifier(NodeIdentifierWithPredicates.of(FlowspecRoute.QNAME, FlowspecRoute.QNAME, entry)); entry.withChild(Builders.unkeyedListBuilder() .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_NID) .withChild(Builders.unkeyedListEntryBuilder() diff --git a/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/GlobalUtilTest.java b/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/GlobalUtilTest.java index 10d0e9631e..847f604770 100644 --- a/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/GlobalUtilTest.java +++ b/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/GlobalUtilTest.java @@ -5,10 +5,10 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.protocol.bgp.state; import static org.junit.Assert.assertNull; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.opendaylight.protocol.bgp.state.StateProviderImplTest.TABLES_KEY; @@ -16,7 +16,6 @@ import java.util.Optional; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; -import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.opendaylight.protocol.bgp.openconfig.spi.BGPTableTypeRegistryConsumer; import org.opendaylight.protocol.bgp.rib.spi.state.BGPRibState; @@ -30,7 +29,7 @@ public class GlobalUtilTest { @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); - doReturn(Optional.empty()).when(this.tableRegistry).getAfiSafiType(Mockito.eq(TABLES_KEY)); + doReturn(Optional.empty()).when(this.tableRegistry).getAfiSafiType(eq(TABLES_KEY)); } @Test diff --git a/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/NeighborUtilTest.java b/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/NeighborUtilTest.java index d66059cf2c..928822c28a 100644 --- a/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/NeighborUtilTest.java +++ b/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/NeighborUtilTest.java @@ -5,12 +5,11 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.protocol.bgp.state; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -73,9 +72,9 @@ public class NeighborUtilTest { doReturn(false).when(this.bgpAfiSafiState).isAfiSafiSupported(eq(TABLES_KEY)); doReturn(false).when(this.bgpAfiSafiState).isGracefulRestartAdvertized(eq(TABLES_KEY)); doReturn(false).when(this.bgpAfiSafiState).isGracefulRestartReceived(eq(TABLES_KEY)); - doReturn(false).when(this.bgpAfiSafiState).isLlGracefulRestartAdvertised((eq(TABLES_KEY))); - doReturn(false).when(this.bgpAfiSafiState).isLlGracefulRestartReceived((eq(TABLES_KEY))); - doReturn(0).when(this.bgpAfiSafiState).getLlGracefulRestartTimer((eq(TABLES_KEY))); + doReturn(false).when(this.bgpAfiSafiState).isLlGracefulRestartAdvertised(eq(TABLES_KEY)); + doReturn(false).when(this.bgpAfiSafiState).isLlGracefulRestartReceived(eq(TABLES_KEY)); + doReturn(0).when(this.bgpAfiSafiState).getLlGracefulRestartTimer(eq(TABLES_KEY)); } diff --git a/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/PeerGroupUtilTest.java b/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/PeerGroupUtilTest.java index ca86f0bb2e..1347c857b2 100644 --- a/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/PeerGroupUtilTest.java +++ b/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/PeerGroupUtilTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.protocol.bgp.state; import static org.junit.Assert.assertNull; diff --git a/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/StateProviderImplTest.java b/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/StateProviderImplTest.java index af04b2be69..b0ad8e5eae 100644 --- a/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/StateProviderImplTest.java +++ b/bgp/openconfig-state/src/test/java/org/opendaylight/protocol/bgp/state/StateProviderImplTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.protocol.bgp.state; import static org.junit.Assert.assertEquals; diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/PathIdUtil.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/PathIdUtil.java index 67848ca66c..bc38f941e4 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/PathIdUtil.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/PathIdUtil.java @@ -69,8 +69,8 @@ public final class PathIdUtil { public static NodeIdentifierWithPredicates createNodeIdentifierWithPredicates(final QName routeQname, final QName pathidQname, final Object pathId, final QName routeKeyQname, final Object keyObject) { - final ImmutableMap keyValues = ImmutableMap.of(pathidQname, pathId, routeKeyQname, keyObject); - return new NodeIdentifierWithPredicates(routeQname, keyValues); + return NodeIdentifierWithPredicates.of(routeQname, + ImmutableMap.of(pathidQname, pathId, routeKeyQname, keyObject)); } /** 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 c49d5b7f5c..26e4be6567 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 @@ -355,7 +355,7 @@ public final class RIBImpl extends BGPRibStateImpl implements RIB, TransactionCh .addChild(ImmutableNodes.mapNodeBuilder(RIB_NID).build()).build(); final MapEntryNode ribInstance = Builders.mapEntryBuilder().withNodeIdentifier( - new NodeIdentifierWithPredicates(Rib.QNAME, RIB_ID_QNAME, this.ribId.getValue())) + NodeIdentifierWithPredicates.of(Rib.QNAME, RIB_ID_QNAME, this.ribId.getValue())) .addChild(ImmutableNodes.leafNode(RIB_ID_QNAME, this.ribId.getValue())) .addChild(ImmutableNodes.mapNodeBuilder(PEER_NID).build()) .addChild(Builders.containerBuilder().withNodeIdentifier(LOCRIB_NID) diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractRIBTestSetup.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractRIBTestSetup.java index 1de7bd2e86..841aad5664 100644 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractRIBTestSetup.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AbstractRIBTestSetup.java @@ -213,7 +213,7 @@ public class AbstractRIBTestSetup extends DefaultRibPoliciesMockTest { final Collection children = new HashSet<>(); for (final Ipv4Prefix p : prefix) { final NodeIdentifierWithPredicates routekey = - new NodeIdentifierWithPredicates(Ipv4Route.QNAME, PREFIX_QNAME, p); + NodeIdentifierWithPredicates.of(Ipv4Route.QNAME, PREFIX_QNAME, p); final DataContainerNodeBuilder b = ImmutableNodes.mapEntryBuilder(); b.withNodeIdentifier(routekey); @@ -233,7 +233,7 @@ public class AbstractRIBTestSetup extends DefaultRibPoliciesMockTest { public PathArgument createIdentifier(final Ipv4Prefix prefix) { final NodeIdentifierWithPredicates routekey = - new NodeIdentifierWithPredicates(Ipv4Route.QNAME, PREFIX_QNAME, prefix); + NodeIdentifierWithPredicates.of(Ipv4Route.QNAME, PREFIX_QNAME, prefix); return YangInstanceIdentifier.of(PREFIX_QNAME).node(routekey).getLastPathArgument(); } diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/FSMTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/FSMTest.java index 2379e859f2..fa40459bc0 100644 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/FSMTest.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/FSMTest.java @@ -31,7 +31,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; import org.junit.Before; import org.junit.Test; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.opendaylight.protocol.bgp.parser.BGPError; @@ -138,7 +138,7 @@ public class FSMTest { doReturn(this.pipeline).when(this.speakerListener).pipeline(); doReturn(this.pipeline).when(this.pipeline).replace(any(ChannelHandler.class), any(String.class), any(ChannelHandler.class)); - doReturn(null).when(this.pipeline).replace(Matchers.>any(), any(String.class), + doReturn(null).when(this.pipeline).replace(ArgumentMatchers.>any(), any(String.class), any(ChannelHandler.class)); doReturn(this.pipeline).when(this.pipeline).addLast(any(ChannelHandler.class)); doReturn(mock(ChannelFuture.class)).when(this.speakerListener).close(); diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SynchronizationAndExceptionTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SynchronizationAndExceptionTest.java index 0206eee9bb..82e8bbb13c 100644 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SynchronizationAndExceptionTest.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SynchronizationAndExceptionTest.java @@ -45,7 +45,7 @@ import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; import org.junit.Before; import org.junit.Test; -import org.mockito.Matchers; +import org.mockito.ArgumentMatchers; import org.mockito.Mock; import org.opendaylight.mdsal.common.api.CommitInfo; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; @@ -163,9 +163,9 @@ public class SynchronizationAndExceptionTest extends AbstractAddPathTest { doReturn(this.eventLoop).when(this.speakerListener).eventLoop(); doReturn(true).when(this.speakerListener).isActive(); doAnswer(invocation -> { - final Runnable command = (Runnable) invocation.getArguments()[0]; - final long delay = (long) invocation.getArguments()[1]; - final TimeUnit unit = (TimeUnit) invocation.getArguments()[2]; + final Runnable command = invocation.getArgument(0); + final long delay = (long) invocation.getArgument(1); + final TimeUnit unit = invocation.getArgument(2); GlobalEventExecutor.INSTANCE.schedule(command, delay, unit); return null; }).when(this.eventLoop).schedule(any(Runnable.class), any(long.class), any(TimeUnit.class)); @@ -179,7 +179,7 @@ public class SynchronizationAndExceptionTest extends AbstractAddPathTest { doReturn(this.pipeline).when(this.pipeline).replace(any(ChannelHandler.class), any(String.class), any(ChannelHandler.class)); - doReturn(null).when(this.pipeline).replace(Matchers.>any(), + doReturn(null).when(this.pipeline).replace(ArgumentMatchers.>any(), any(String.class), any(ChannelHandler.class)); doReturn(this.pipeline).when(this.pipeline).addLast(any(ChannelHandler.class)); diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImplTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImplTest.java index 8643d844ca..a5a7ff44dd 100644 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImplTest.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/RibImplTest.java @@ -16,7 +16,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import com.google.common.collect.ImmutableClassToInstanceMap; -import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.primitives.Shorts; import java.util.ArrayList; @@ -93,8 +92,8 @@ public class RibImplTest extends AbstractConfig { doReturn(ImmutableSet.of()).when(this.ribSupport).cacheableAttributeObjects(); final MapEntryNode emptyTable = mock(MapEntryNode.class); doReturn(emptyTable).when(this.ribSupport).emptyTable(); - final NodeIdentifierWithPredicates niie = new NodeIdentifierWithPredicates(Rib.QNAME, - ImmutableMap.of(QName.create("", "test").intern(), "t")); + final NodeIdentifierWithPredicates niie = NodeIdentifierWithPredicates.of(Rib.QNAME, + QName.create("", "test").intern(), "t"); doReturn(niie).when(emptyTable).getIdentifier(); doReturn(QName.create("", "test").intern()).when(emptyTable).getNodeType(); doReturn(this.domTx).when(this.domDataBroker).createMergingTransactionChain(any()); diff --git a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/IdentifierUtilsTest.java b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/IdentifierUtilsTest.java index 49e4052783..3fba12aea3 100644 --- a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/IdentifierUtilsTest.java +++ b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/IdentifierUtilsTest.java @@ -13,7 +13,6 @@ import static org.opendaylight.protocol.bgp.rib.spi.RIBNodeIdentifiers.LOCRIB_NI import static org.opendaylight.protocol.bgp.rib.spi.RIBNodeIdentifiers.PEER_NID; import static org.opendaylight.protocol.bgp.rib.spi.RIBQNames.PEER_ID_QNAME; -import com.google.common.collect.ImmutableMap; import org.junit.Test; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.PeerId; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.bgp.rib.rib.Peer; @@ -29,10 +28,10 @@ public class IdentifierUtilsTest { private static final QName TABLES_KEY_QNAME = QName.create(Tables.QNAME, "tables-key").intern(); private static final TablesKey TK = new TablesKey(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class); private static final PeerId PEER_ID = new PeerId("127.0.0.1"); - private static final NodeIdentifierWithPredicates NIWP_PEER = new NodeIdentifierWithPredicates(Peer.QNAME, - ImmutableMap.of(PEER_ID_QNAME, PEER_ID.getValue())); - private static final NodeIdentifierWithPredicates NIWP_TABLE = new NodeIdentifierWithPredicates(Tables.QNAME, - ImmutableMap.of(TABLES_KEY_QNAME, TK)); + private static final NodeIdentifierWithPredicates NIWP_PEER = NodeIdentifierWithPredicates.of(Peer.QNAME, + PEER_ID_QNAME, PEER_ID.getValue()); + private static final NodeIdentifierWithPredicates NIWP_TABLE = NodeIdentifierWithPredicates.of(Tables.QNAME, + TABLES_KEY_QNAME, TK); private static final YangInstanceIdentifier YII_PEER; private static final YangInstanceIdentifier YII_TABLE; diff --git a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupportTest.java b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupportTest.java index d5278196e8..b959d67816 100644 --- a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupportTest.java +++ b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupportTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.protocol.bgp.rib.spi; import static junit.framework.TestCase.assertFalse; @@ -16,7 +15,6 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; -import com.google.common.collect.ImmutableMap; import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -78,8 +76,8 @@ public class RIBSupportTest extends AbstractConcurrentDataBrokerTest { private static final String ROUTE_KEY = "prefix"; private static final String PREFIX = "1.2.3.4/32"; private static final QName PATH_ID_QNAME = QName.create(Ipv4Route.QNAME, "path-id").intern(); - private static final NodeIdentifierWithPredicates PREFIX_NII = new NodeIdentifierWithPredicates(Ipv4Route.QNAME, - ImmutableMap.of(QName.create(Ipv4Route.QNAME, ROUTE_KEY).intern(), PREFIX)); + private static final NodeIdentifierWithPredicates PREFIX_NII = NodeIdentifierWithPredicates.of(Ipv4Route.QNAME, + QName.create(Ipv4Route.QNAME, ROUTE_KEY).intern(), PREFIX); private RIBSupportTestImp ribSupportTestImp; private static final TablesKey TABLES_KEY = new TablesKey(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class); diff --git a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupportTestImp.java b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupportTestImp.java index c5f0ae1ebb..347f89270e 100644 --- a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupportTestImp.java +++ b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupportTestImp.java @@ -5,10 +5,8 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.protocol.bgp.rib.spi; -import com.google.common.collect.ImmutableMap; import java.util.Collection; import java.util.Collections; import java.util.List; @@ -37,8 +35,8 @@ public final class RIBSupportTestImp extends AbstractRIBSupport extractAdjRibInRoutes(Routes routes) { + public List extractAdjRibInRoutes(final Routes routes) { return ((org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.test.rev180515.bgp.rib.rib.peer .adj.rib.in.tables.routes.Ipv4RoutesCase) routes).getIpv4Routes().nonnullIpv4Route(); } diff --git a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RibSupportUtilsTest.java b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RibSupportUtilsTest.java index 696e6f32ef..e74e7b89b6 100644 --- a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RibSupportUtilsTest.java +++ b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RibSupportUtilsTest.java @@ -38,14 +38,13 @@ public class RibSupportUtilsTest { "afi"); final QName safi = QName.create("urn:opendaylight:params:xml:ns:yang:bgp-rib?revision=2018-03-29", "safi"); - NII = new NodeIdentifierWithPredicates(SupportedTables.QNAME, ImmutableMap.of(afi, Ipv4AddressFamily.QNAME, + NII = NodeIdentifierWithPredicates.of(SupportedTables.QNAME, ImmutableMap.of(afi, Ipv4AddressFamily.QNAME, safi, UnicastSubsequentAddressFamily.QNAME)); - NII_PATH = new NodeIdentifierWithPredicates(SupportedTables.QNAME, ImmutableMap.of( - QName.create("urn:opendaylight:params:xml:ns:yang:bgp-multiprotocol?revision=2018-03-29", - "afi"), Ipv4AddressFamily.QNAME, - QName.create("urn:opendaylight:params:xml:ns:yang:bgp-multiprotocol?revision=2018-03-29", - "safi"), UnicastSubsequentAddressFamily.QNAME) - ); + NII_PATH = NodeIdentifierWithPredicates.of(SupportedTables.QNAME, ImmutableMap.of( + QName.create("urn:opendaylight:params:xml:ns:yang:bgp-multiprotocol?revision=2018-03-29", "afi"), + Ipv4AddressFamily.QNAME, + QName.create("urn:opendaylight:params:xml:ns:yang:bgp-multiprotocol?revision=2018-03-29", "safi"), + UnicastSubsequentAddressFamily.QNAME)); } @Test diff --git a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/util/ClusterSingletonServiceRegistrationHelperTest.java b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/util/ClusterSingletonServiceRegistrationHelperTest.java index 53fc2d8f16..134934c666 100644 --- a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/util/ClusterSingletonServiceRegistrationHelperTest.java +++ b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/util/ClusterSingletonServiceRegistrationHelperTest.java @@ -5,11 +5,10 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.protocol.bgp.rib.spi.util; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; import static org.mockito.MockitoAnnotations.initMocks; @@ -54,5 +53,4 @@ public class ClusterSingletonServiceRegistrationHelperTest { //first reg. attempt failed, second succeeded verify(this.singletonProvider, Mockito.times(2)).registerClusterSingletonService(any()); } - } diff --git a/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterImpl.java b/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterImpl.java index 6cf121c277..7b22e003c4 100644 --- a/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterImpl.java +++ b/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterImpl.java @@ -201,7 +201,7 @@ public final class BmpRouterImpl implements BmpRouter, DOMTransactionChainListen final DOMDataTreeWriteTransaction wTx = this.domTxChain.newWriteOnlyTransaction(); wTx.put(LogicalDatastoreType.OPERATIONAL, this.routerYangIId, Builders.mapEntryBuilder() - .withNodeIdentifier(new NodeIdentifierWithPredicates(Router.QNAME, ROUTER_ID_QNAME, this.routerIp)) + .withNodeIdentifier(NodeIdentifierWithPredicates.of(Router.QNAME, ROUTER_ID_QNAME, this.routerIp)) .withChild(ImmutableNodes.leafNode(ROUTER_ID_QNAME, this.routerIp)) .withChild(ImmutableNodes.leafNode(ROUTER_STATUS_QNAME, DOWN)) .withChild(ImmutableNodes.mapNodeBuilder(Peer.QNAME).build()).build()); @@ -223,7 +223,7 @@ public final class BmpRouterImpl implements BmpRouter, DOMTransactionChainListen final DOMDataTreeWriteTransaction wTx = this.domTxChain.newWriteOnlyTransaction(); wTx.merge(LogicalDatastoreType.OPERATIONAL, this.routerYangIId, Builders.mapEntryBuilder() - .withNodeIdentifier(new NodeIdentifierWithPredicates(Router.QNAME, ROUTER_ID_QNAME, this.routerIp)) + .withNodeIdentifier(NodeIdentifierWithPredicates.of(Router.QNAME, ROUTER_ID_QNAME, this.routerIp)) .withChild(ImmutableNodes.leafNode(ROUTER_NAME_QNAME, initiation.getTlvs().getNameTlv().getName())) .withChild(ImmutableNodes.leafNode(ROUTER_DESCRIPTION_QNAME, initiation.getTlvs().getDescriptionTlv() .getDescription())) diff --git a/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterPeerImpl.java b/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterPeerImpl.java index 317d933ef1..26d141fce2 100644 --- a/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterPeerImpl.java +++ b/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterPeerImpl.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.protocol.bmp.impl.app; import static java.util.Objects.requireNonNull; @@ -75,7 +74,6 @@ import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContaine import org.slf4j.Logger; import org.slf4j.LoggerFactory; - public final class BmpRouterPeerImpl implements BmpRouterPeer { private static final Logger LOG = LoggerFactory.getLogger(BmpRouterPeerImpl.class); @@ -302,7 +300,7 @@ public final class BmpRouterPeerImpl implements BmpRouterPeer { final PeerHeader peerHeader = peerUp.getPeerHeader(); final DataContainerNodeBuilder mapEntryBuilder = Builders.mapEntryBuilder() - .withNodeIdentifier(new NodeIdentifierWithPredicates(Peer.QNAME, PEER_ID_QNAME, + .withNodeIdentifier(NodeIdentifierWithPredicates.of(Peer.QNAME, PEER_ID_QNAME, this.peerId.getValue())) .withChild(ImmutableNodes.leafNode(PEER_ID_QNAME, this.peerId.getValue())) .withChild(ImmutableNodes.leafNode(PEER_TYPE_QNAME, diff --git a/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TablesUtil.java b/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TablesUtil.java index 91cd860fe9..aa041d8111 100644 --- a/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TablesUtil.java +++ b/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TablesUtil.java @@ -41,10 +41,9 @@ public final class TablesUtil { */ public static NodeIdentifierWithPredicates toYangTablesKey(final Class afi, final Class safi) { - final ImmutableMap keyValues = ImmutableMap.of( - BMP_AFI_QNAME, BindingReflections.findQName(afi), - BMP_SAFI_QNAME, BindingReflections.findQName(safi)); - return new NodeIdentifierWithPredicates(BMP_TABLES_QNAME, keyValues); + return NodeIdentifierWithPredicates.of(BMP_TABLES_QNAME, ImmutableMap.of( + BMP_AFI_QNAME, BindingReflections.findQName(afi), + BMP_SAFI_QNAME, BindingReflections.findQName(safi))); } /** @@ -60,10 +59,9 @@ public final class TablesUtil { final Class safi) { final QName afiQname = QName.create(nodeName, AFI).intern(); final QName safiQname = QName.create(nodeName, SAFI).intern(); - final ImmutableMap keyValues = ImmutableMap.of( - afiQname, BindingReflections.findQName(afi), - safiQname, BindingReflections.findQName(safi)); - return new NodeIdentifierWithPredicates(nodeName, keyValues); + return NodeIdentifierWithPredicates.of(nodeName, ImmutableMap.of( + afiQname, BindingReflections.findQName(afi), + safiQname, BindingReflections.findQName(safi))); } /** diff --git a/config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/ConfigLoaderImplTest.java b/config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/ConfigLoaderImplTest.java index 88e18bd020..79c02bd089 100644 --- a/config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/ConfigLoaderImplTest.java +++ b/config-loader/config-loader-impl/src/test/java/org/opendaylight/bgpcep/config/loader/impl/ConfigLoaderImplTest.java @@ -5,11 +5,10 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.bgpcep.config.loader.impl; import static org.junit.Assert.assertNotNull; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.verify; -- 2.36.6