From: Claudio D. Gasparini Date: Tue, 31 Jan 2017 10:47:45 +0000 (+0100) Subject: Code clean up X-Git-Tag: release/carbon~53 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=c6cdadbb3672a6ab27b556a98045287404faa529;p=bgpcep.git Code clean up Remove redundant cast/type argument Change-Id: I446cb24bdbcb5156136899798eb6d3d607291e62 Signed-off-by: Claudio D. Gasparini --- 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 17593c0841..81efd3d241 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 @@ -119,7 +119,7 @@ public class AppPeerBenchmark implements OdlBgpAppPeerBenchmarkService, Transact .setSafi(UnicastSubsequentAddressFamily.class) .setRoutes( new Ipv4RoutesCaseBuilder().setIpv4Routes( - new Ipv4RoutesBuilder().setIpv4Route(Collections. emptyList()).build()) + new Ipv4RoutesBuilder().setIpv4Route(Collections.emptyList()).build()) .build()).build(); final ApplicationRib appRib = new ApplicationRibBuilder() diff --git a/bgp/benchmark-app/src/test/java/org/opendaylight/protocol/bgp/benchmark/app/AppPeerBenchmarkTest.java b/bgp/benchmark-app/src/test/java/org/opendaylight/protocol/bgp/benchmark/app/AppPeerBenchmarkTest.java index 620d6cfe67..b7cbfc5570 100644 --- a/bgp/benchmark-app/src/test/java/org/opendaylight/protocol/bgp/benchmark/app/AppPeerBenchmarkTest.java +++ b/bgp/benchmark-app/src/test/java/org/opendaylight/protocol/bgp/benchmark/app/AppPeerBenchmarkTest.java @@ -65,7 +65,7 @@ public class AppPeerBenchmarkTest extends AbstractDataBrokerTest { @Before public void setUp() throws MalformedObjectNameException { MockitoAnnotations.initMocks(this); - Mockito.doReturn(this.registration).when(this.rpcRegistry).addRpcImplementation(Mockito.>any(), + Mockito.doReturn(this.registration).when(this.rpcRegistry).addRpcImplementation(Mockito.any(), Mockito.any(OdlBgpAppPeerBenchmarkService.class)); Mockito.doNothing().when(this.registration).close(); this.appPeerBenchmark = new AppPeerBenchmark(getDataBroker(), this.rpcRegistry, PEER_RIB_ID); diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/controller/config/yang/bmp/impl/BmpMonitorImplModule.java b/bgp/bmp-impl/src/main/java/org/opendaylight/controller/config/yang/bmp/impl/BmpMonitorImplModule.java index 66c144c1b8..242b72769b 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/controller/config/yang/bmp/impl/BmpMonitorImplModule.java +++ b/bgp/bmp-impl/src/main/java/org/opendaylight/controller/config/yang/bmp/impl/BmpMonitorImplModule.java @@ -69,7 +69,7 @@ public class BmpMonitorImplModule extends org.opendaylight.controller.config.yan } } - return ret.isEmpty() ? Optional.absent() : Optional.of(ret); + return ret.isEmpty() ? Optional.absent() : Optional.of(ret); } @Override 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 f93876c28f..76a13566b7 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 @@ -88,7 +88,7 @@ public final class BmpMonitoringStationImpl implements BmpMonitoringStation { ret = KeyMapping.getKeyMapping(addr, rfc2385KeyPassword.getValue()); dispatcher.createClient( Ipv4Util.toInetSocketAddress(mr.getAddress(), mr.getPort()), - this.sessionManager, Optional.fromNullable(ret)); + this.sessionManager, Optional.fromNullable(ret)); } } } diff --git a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TablesUtil.java b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TablesUtil.java index 6103be9261..5e72ba8d12 100644 --- a/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TablesUtil.java +++ b/bgp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TablesUtil.java @@ -37,7 +37,7 @@ public final class TablesUtil { */ public static NodeIdentifierWithPredicates toYangTablesKey(final Class afi, final Class safi) { - final ImmutableMap keyValues = ImmutableMap.of( + final ImmutableMap keyValues = ImmutableMap.of( BMP_AFI_QNAME, BindingReflections.findQName(afi), BMP_SAFI_QNAME, BindingReflections.findQName(safi)); return new NodeIdentifierWithPredicates(BMP_TABLES_QNAME, keyValues); @@ -55,7 +55,7 @@ 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( + final ImmutableMap keyValues = ImmutableMap.of( afiQname, BindingReflections.findQName(afi), safiQname, BindingReflections.findQName(safi)); return new NodeIdentifierWithPredicates(nodeName, keyValues); diff --git a/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/session/BmpDispatcherImplTest.java b/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/session/BmpDispatcherImplTest.java index 82463e25a3..7575692dde 100644 --- a/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/session/BmpDispatcherImplTest.java +++ b/bgp/bmp-impl/src/test/java/org/opendaylight/protocol/bmp/impl/session/BmpDispatcherImplTest.java @@ -88,9 +88,9 @@ public class BmpDispatcherImplTest { @Test public void testCreateServer() throws Exception { - final Channel serverChannel = this.dispatcher.createServer(SERVER, this.mockedListenerFactory, Optional.absent()).await().channel(); + final Channel serverChannel = this.dispatcher.createServer(SERVER, this.mockedListenerFactory, Optional.absent()).await().channel(); Assert.assertTrue(serverChannel.isActive()); - final Channel clientChannel = this.dispatcher.createClient(CLIENT_REMOTE, this.mockedListenerFactory, Optional.absent()).await().channel(); + final Channel clientChannel = this.dispatcher.createClient(CLIENT_REMOTE, this.mockedListenerFactory, Optional.absent()).await().channel(); Assert.assertTrue(clientChannel.isActive()); Thread.sleep(500); Mockito.verify(this.mockedSession, Mockito.times(2)).handlerAdded(Mockito.any(ChannelHandlerContext.class)); diff --git a/bgp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockDispatcherTest.java b/bgp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockDispatcherTest.java index 298194009c..84710a0c19 100644 --- a/bgp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockDispatcherTest.java +++ b/bgp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockDispatcherTest.java @@ -39,7 +39,7 @@ public class BmpMockDispatcherTest { final InetSocketAddress serverAddr = InetSocketAddressUtil.getRandomLoopbackInetSocketAddress(port); final BmpDispatcherImpl serverDispatcher = new BmpDispatcherImpl(new NioEventLoopGroup(), new NioEventLoopGroup(), this.registry, this.sessionFactory); - final ChannelFuture futureServer = serverDispatcher.createServer(serverAddr, this.slf, Optional.absent()); + final ChannelFuture futureServer = serverDispatcher.createServer(serverAddr, this.slf, Optional.absent()); waitFutureComplete(futureServer); final ChannelFuture channelFuture = dispatcher.createClient(InetSocketAddressUtil.getRandomLoopbackInetSocketAddress(0), serverAddr); @@ -59,7 +59,7 @@ public class BmpMockDispatcherTest { this.registry, this.sessionFactory); final ChannelFuture futureServer = dispatcher.createServer(new InetSocketAddress(InetAddresses.forString("0.0.0.0"), port)); waitFutureComplete(futureServer); - final ChannelFuture channelFuture = serverDispatcher.createClient(InetSocketAddressUtil.getRandomLoopbackInetSocketAddress(port), this.slf, Optional.absent()); + final ChannelFuture channelFuture = serverDispatcher.createClient(InetSocketAddressUtil.getRandomLoopbackInetSocketAddress(port), this.slf, Optional.absent()); waitFutureComplete(channelFuture); final Channel channel = channelFuture.sync().channel(); diff --git a/bgp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockTest.java b/bgp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockTest.java index 388ed30c40..766766f2a4 100644 --- a/bgp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockTest.java +++ b/bgp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockTest.java @@ -62,7 +62,7 @@ public class BmpMockTest { final InetSocketAddress serverAddr = InetSocketAddressUtil.getRandomLoopbackInetSocketAddress(); final BmpSessionListenerFactory bmpSessionListenerFactory = () -> BmpMockTest.this.sessionListener; final ChannelFuture futureServer = bmpDispatcher.createServer(serverAddr, - bmpSessionListenerFactory, Optional.absent()); + bmpSessionListenerFactory, Optional.absent()); waitFutureComplete(futureServer); Channel serverChannel; int sessionUpWait; @@ -95,7 +95,7 @@ public class BmpMockTest { BmpMock.main(new String[]{"--local_address", InetSocketAddressUtil.toHostAndPort(serverAddr).toString(), "--peers_count", "3", "--pre_policy_routes", "3", "--passive"}); final ChannelFuture futureServer = bmpDispatcher.createClient(serverAddr, - bmpSessionListenerFactory, Optional.absent()); + bmpSessionListenerFactory, Optional.absent()); waitFutureComplete(futureServer); Channel serverChannel; int sessionUpWait; diff --git a/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/InitiationHandler.java b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/InitiationHandler.java index b40992825c..325159fec5 100644 --- a/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/InitiationHandler.java +++ b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/InitiationHandler.java @@ -49,7 +49,7 @@ public class InitiationHandler extends AbstractBmpMessageWithTlvParserof()); + tlvsBuilder.setStringInformation(ImmutableList.of()); parseTlvs(tlvsBuilder, bytes); if (tlvsBuilder.getDescriptionTlv() == null || tlvsBuilder.getDescriptionTlv().getDescription() == null) { diff --git a/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/TerminationHandler.java b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/TerminationHandler.java index db80561c56..2f051b0b18 100644 --- a/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/TerminationHandler.java +++ b/bgp/bmp-parser-impl/src/main/java/org/opendaylight/protocol/bmp/parser/message/TerminationHandler.java @@ -41,7 +41,7 @@ public class TerminationHandler extends AbstractBmpMessageWithTlvParserof()); + tlvsBuilder.setStringInformation(ImmutableList.of()); parseTlvs(tlvsBuilder, bytes); if (tlvsBuilder.getReasonTlv() == null || tlvsBuilder.getReasonTlv().getReason() == null) { throw new BmpDeserializationException("Inclusion of Reason TLV is mandatory."); diff --git a/bgp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/registry/SimpleBmpMessageRegistryTest.java b/bgp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/registry/SimpleBmpMessageRegistryTest.java index dfb9e0f172..0c90f22c2c 100644 --- a/bgp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/registry/SimpleBmpMessageRegistryTest.java +++ b/bgp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/registry/SimpleBmpMessageRegistryTest.java @@ -46,7 +46,7 @@ public class SimpleBmpMessageRegistryTest { this.registry.registerBmpMessageSerializer(BmpTestMessage.class, bmpTestParser); final BmpTestMessage message = new BmpTestMessage(257); - assertEquals(message.toString(), ((BmpTestMessage)this.registry.parseMessage(Unpooled.copiedBuffer(BMP_TEST_MESSAGE))).toString()); + assertEquals(message.toString(), this.registry.parseMessage(Unpooled.copiedBuffer(BMP_TEST_MESSAGE)).toString()); final ByteBuf aggregator = Unpooled.buffer(BMP_TEST_MESSAGE.length); this.registry.serializeMessage(message, aggregator); diff --git a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv6NlriParserTest.java b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv6NlriParserTest.java index 72d060df98..c8c0fda3aa 100644 --- a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv6NlriParserTest.java +++ b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/FlowspecL3vpnIpv6NlriParserTest.java @@ -356,11 +356,11 @@ public class FlowspecL3vpnIpv6NlriParserTest { .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_TYPE_NID) .withChild(Builders.unkeyedListBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.FRAGMENT_NID) .withChild(Builders.unkeyedListEntryBuilder().withNodeIdentifier(FlowspecL3vpnIpv6NlriParser.OP_NID) - .withChild(Builders.leafBuilder().withNodeIdentifier(FlowspecL3vpnIpv6NlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.AND_BIT_VALUE, AbstractOperandParser.END_OF_LIST_VALUE, BitmaskOperandParser.MATCH_VALUE, BitmaskOperandParser.NOT_VALUE)).build()) + .withChild(Builders.leafBuilder().withNodeIdentifier(FlowspecL3vpnIpv6NlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.AND_BIT_VALUE, AbstractOperandParser.END_OF_LIST_VALUE, BitmaskOperandParser.MATCH_VALUE, BitmaskOperandParser.NOT_VALUE)).build()) .withChild(Builders.leafBuilder().withNodeIdentifier(FlowspecL3vpnIpv6NlriParser.VALUE_NID).withValue(Sets.newHashSet(AbstractFlowspecNlriParser.DO_NOT_VALUE, AbstractFlowspecNlriParser.FIRST_VALUE, AbstractFlowspecNlriParser.IS_A_VALUE, AbstractFlowspecNlriParser.LAST_VALUE)).build()).build()) .build()).build()).build()).build()); final FlowspecBuilder expectedFS = new FlowspecBuilder(); - expectedFS.setFlowspecType(new FragmentCaseBuilder().setFragments(Lists.newArrayList(new FragmentsBuilder().setValue(new Fragment(true, true, true, true)).setOp(new BitmaskOperand(true, true, true, true)).build())).build()); + expectedFS.setFlowspecType(new FragmentCaseBuilder().setFragments(Lists.newArrayList(new FragmentsBuilder().setValue(new Fragment(true, true, true, true)).setOp(new BitmaskOperand(true, true, true, true)).build())).build()); final List expectedValue = new ArrayList<>(); expectedValue.add(expectedFS.build()); assertEquals(expectedValue, FS_PARSER.extractFlowspec(entry.build())); @@ -378,18 +378,18 @@ public class FlowspecL3vpnIpv6NlriParserTest { .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_TYPE_NID) .withChild(Builders.unkeyedListBuilder().withNodeIdentifier(NEXT_HEADER_NID) .withChild(Builders.unkeyedListEntryBuilder().withNodeIdentifier(NEXT_HEADER_NID) - .withChild(Builders.leafBuilder().withNodeIdentifier(FlowspecL3vpnIpv6NlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.END_OF_LIST_VALUE, AbstractOperandParser.AND_BIT_VALUE)).build()) + .withChild(Builders.leafBuilder().withNodeIdentifier(FlowspecL3vpnIpv6NlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.END_OF_LIST_VALUE, AbstractOperandParser.AND_BIT_VALUE)).build()) .withChild(Builders.leafBuilder().withNodeIdentifier(FlowspecL3vpnIpv6NlriParser.VALUE_NID).withValue((short) 100).build()).build()) .withChild(Builders.unkeyedListEntryBuilder().withNodeIdentifier(NEXT_HEADER_NID) - .withChild(Builders.leafBuilder().withNodeIdentifier(FlowspecL3vpnIpv6NlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.AND_BIT_VALUE)).build()) + .withChild(Builders.leafBuilder().withNodeIdentifier(FlowspecL3vpnIpv6NlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.AND_BIT_VALUE)).build()) .withChild(Builders.leafBuilder().withNodeIdentifier(FlowspecL3vpnIpv6NlriParser.VALUE_NID).withValue((short) 200).build()).build()) .withChild(Builders.unkeyedListEntryBuilder().withNodeIdentifier(NEXT_HEADER_NID) - .withChild(Builders.leafBuilder().withNodeIdentifier(FlowspecL3vpnIpv6NlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.END_OF_LIST_VALUE, AbstractOperandParser.AND_BIT_VALUE, AbstractNumericOperandParser.EQUALS_VALUE)).build()) + .withChild(Builders.leafBuilder().withNodeIdentifier(FlowspecL3vpnIpv6NlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.END_OF_LIST_VALUE, AbstractOperandParser.AND_BIT_VALUE, AbstractNumericOperandParser.EQUALS_VALUE)).build()) .withChild(Builders.leafBuilder().withNodeIdentifier(FlowspecL3vpnIpv6NlriParser.VALUE_NID).withValue((short) 210).build()).build()) .build()).build()).build()).build()); final FlowspecBuilder expectedFS = new FlowspecBuilder(); - expectedFS.setFlowspecType(new NextHeaderCaseBuilder().setNextHeaders(Lists.newArrayList( + expectedFS.setFlowspecType(new NextHeaderCaseBuilder().setNextHeaders(Lists.newArrayList( new NextHeadersBuilder().setValue((short) 100).setOp(new NumericOperand(true, true, false, false, false)).build(), new NextHeadersBuilder().setValue((short) 200).setOp(new NumericOperand(true, false, false, false, false)).build(), new NextHeadersBuilder().setValue((short) 210).setOp(new NumericOperand(true, true, true, false, false)).build())).build()); @@ -410,15 +410,15 @@ public class FlowspecL3vpnIpv6NlriParserTest { .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_TYPE_NID) .withChild(Builders.unkeyedListBuilder().withNodeIdentifier(FLOW_LABEL_NID) .withChild(Builders.unkeyedListEntryBuilder().withNodeIdentifier(FLOW_LABEL_NID) - .withChild(Builders.leafBuilder().withNodeIdentifier(FlowspecL3vpnIpv6NlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.END_OF_LIST_VALUE, AbstractOperandParser.AND_BIT_VALUE)).build()) + .withChild(Builders.leafBuilder().withNodeIdentifier(FlowspecL3vpnIpv6NlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.END_OF_LIST_VALUE, AbstractOperandParser.AND_BIT_VALUE)).build()) .withChild(Builders.leafBuilder().withNodeIdentifier(FlowspecL3vpnIpv6NlriParser.VALUE_NID).withValue(100L).build()).build()) .withChild(Builders.unkeyedListEntryBuilder().withNodeIdentifier(FLOW_LABEL_NID) - .withChild(Builders.leafBuilder().withNodeIdentifier(FlowspecL3vpnIpv6NlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.AND_BIT_VALUE)).build()) + .withChild(Builders.leafBuilder().withNodeIdentifier(FlowspecL3vpnIpv6NlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.AND_BIT_VALUE)).build()) .withChild(Builders.leafBuilder().withNodeIdentifier(FlowspecL3vpnIpv6NlriParser.VALUE_NID).withValue(200L).build()).build()) .build()).build()).build()).build()); final FlowspecBuilder expectedFS = new FlowspecBuilder(); - expectedFS.setFlowspecType(new FlowLabelCaseBuilder().setFlowLabel(Lists.newArrayList( + expectedFS.setFlowspecType(new FlowLabelCaseBuilder().setFlowLabel(Lists.newArrayList( new FlowLabelBuilder().setValue(100L).setOp(new NumericOperand(true, true, false, false, false)).build(), new FlowLabelBuilder().setValue(200L).setOp(new NumericOperand(true, false, false, false, false)).build())).build()); final List expectedValue = new ArrayList<>(); diff --git a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv4NlriParserTest.java b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv4NlriParserTest.java index 2f04afcbc0..c943928989 100644 --- a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv4NlriParserTest.java +++ b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv4NlriParserTest.java @@ -535,18 +535,18 @@ public class SimpleFlowspecIpv4NlriParserTest { .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_TYPE_NID) .withChild(Builders.unkeyedListBuilder().withNodeIdentifier(PROTOCOL_IP_NID) .withChild(Builders.unkeyedListEntryBuilder().withNodeIdentifier(PROTOCOL_IP_NID) - .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.END_OF_LIST_VALUE, AbstractOperandParser.AND_BIT_VALUE)).build()) + .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.END_OF_LIST_VALUE, AbstractOperandParser.AND_BIT_VALUE)).build()) .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.VALUE_NID).withValue((short) 100).build()).build()) .withChild(Builders.unkeyedListEntryBuilder().withNodeIdentifier(PROTOCOL_IP_NID) - .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.AND_BIT_VALUE)).build()) + .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.AND_BIT_VALUE)).build()) .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.VALUE_NID).withValue((short) 200).build()).build()) .withChild(Builders.unkeyedListEntryBuilder().withNodeIdentifier(PROTOCOL_IP_NID) - .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.END_OF_LIST_VALUE, AbstractOperandParser.AND_BIT_VALUE, AbstractNumericOperandParser.EQUALS_VALUE)).build()) + .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.END_OF_LIST_VALUE, AbstractOperandParser.AND_BIT_VALUE, AbstractNumericOperandParser.EQUALS_VALUE)).build()) .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.VALUE_NID).withValue((short) 240).build()).build()) .build()).build()).build()).build()); final FlowspecBuilder expectedFS = new FlowspecBuilder(); - expectedFS.setFlowspecType(new ProtocolIpCaseBuilder().setProtocolIps(Lists.newArrayList( + expectedFS.setFlowspecType(new ProtocolIpCaseBuilder().setProtocolIps(Lists.newArrayList( new ProtocolIpsBuilder().setValue((short) 100).setOp(new NumericOperand(true, true, false, false, false)).build(), new ProtocolIpsBuilder().setValue((short) 200).setOp(new NumericOperand(true, false, false, false, false)).build(), new ProtocolIpsBuilder().setValue((short) 240).setOp(new NumericOperand(true, true, true, false, false)).build())).build()); @@ -567,12 +567,12 @@ public class SimpleFlowspecIpv4NlriParserTest { .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_TYPE_NID) .withChild(Builders.unkeyedListBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.PORTS_NID) .withChild(Builders.unkeyedListEntryBuilder().withNodeIdentifier(PROTOCOL_IP_NID) - .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.END_OF_LIST_VALUE, AbstractOperandParser.AND_BIT_VALUE, AbstractNumericOperandParser.LESS_THAN_VALUE)).build()) + .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.END_OF_LIST_VALUE, AbstractOperandParser.AND_BIT_VALUE, AbstractNumericOperandParser.LESS_THAN_VALUE)).build()) .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.VALUE_NID).withValue(100).build()).build()) .build()).build()).build()).build()); final FlowspecBuilder expectedFS = new FlowspecBuilder(); - expectedFS.setFlowspecType(new PortCaseBuilder().setPorts(Lists.newArrayList(new PortsBuilder().setValue(100).setOp(new NumericOperand(true, true, false, false, true)).build())).build()); + expectedFS.setFlowspecType(new PortCaseBuilder().setPorts(Lists.newArrayList(new PortsBuilder().setValue(100).setOp(new NumericOperand(true, true, false, false, true)).build())).build()); final List expected = new ArrayList<>(); expected.add(expectedFS.build()); assertEquals(expected, FS_PARSER.extractFlowspec(entry.build())); @@ -590,11 +590,11 @@ public class SimpleFlowspecIpv4NlriParserTest { .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_TYPE_NID) .withChild(Builders.unkeyedListBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.DEST_PORT_NID) .withChild(Builders.unkeyedListEntryBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID) - .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.END_OF_LIST_VALUE, AbstractNumericOperandParser.EQUALS_VALUE)).build()) + .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.END_OF_LIST_VALUE, AbstractNumericOperandParser.EQUALS_VALUE)).build()) .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.VALUE_NID).withValue(1024).build()).build()) .build()).build()).build()).build()); final FlowspecBuilder expectedFS = new FlowspecBuilder(); - expectedFS.setFlowspecType(new DestinationPortCaseBuilder().setDestinationPorts(Lists.newArrayList(new DestinationPortsBuilder().setValue(1024).setOp(new NumericOperand(false, true, true, false, false)).build())).build()); + expectedFS.setFlowspecType(new DestinationPortCaseBuilder().setDestinationPorts(Lists.newArrayList(new DestinationPortsBuilder().setValue(1024).setOp(new NumericOperand(false, true, true, false, false)).build())).build()); final List expected = new ArrayList<>(); expected.add(expectedFS.build()); assertEquals(expected, FS_PARSER.extractFlowspec(entry.build())); @@ -612,11 +612,11 @@ public class SimpleFlowspecIpv4NlriParserTest { .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_TYPE_NID) .withChild(Builders.unkeyedListBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.SOURCE_PORT_NID) .withChild(Builders.unkeyedListEntryBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID) - .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.AND_BIT_VALUE, AbstractOperandParser.END_OF_LIST_VALUE, AbstractNumericOperandParser.EQUALS_VALUE, AbstractNumericOperandParser.GREATER_THAN_VALUE, AbstractNumericOperandParser.LESS_THAN_VALUE)).build()) + .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.AND_BIT_VALUE, AbstractOperandParser.END_OF_LIST_VALUE, AbstractNumericOperandParser.EQUALS_VALUE, AbstractNumericOperandParser.GREATER_THAN_VALUE, AbstractNumericOperandParser.LESS_THAN_VALUE)).build()) .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.VALUE_NID).withValue(8080).build()).build()) .build()).build()).build()).build()); final FlowspecBuilder expectedFS = new FlowspecBuilder(); - expectedFS.setFlowspecType(new SourcePortCaseBuilder().setSourcePorts(Lists.newArrayList(new SourcePortsBuilder().setValue(8080).setOp(new NumericOperand(true, true, true, true, true)).build())).build()); + expectedFS.setFlowspecType(new SourcePortCaseBuilder().setSourcePorts(Lists.newArrayList(new SourcePortsBuilder().setValue(8080).setOp(new NumericOperand(true, true, true, true, true)).build())).build()); final List expected = new ArrayList<>(); expected.add(expectedFS.build()); assertEquals(expected, FS_PARSER.extractFlowspec(entry.build())); @@ -634,11 +634,11 @@ public class SimpleFlowspecIpv4NlriParserTest { .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_TYPE_NID) .withChild(Builders.unkeyedListBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.ICMP_TYPE_NID) .withChild(Builders.unkeyedListEntryBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID) - .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.AND_BIT_VALUE, AbstractOperandParser.END_OF_LIST_VALUE, AbstractNumericOperandParser.EQUALS_VALUE, AbstractNumericOperandParser.GREATER_THAN_VALUE, AbstractNumericOperandParser.LESS_THAN_VALUE)).build()) + .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.AND_BIT_VALUE, AbstractOperandParser.END_OF_LIST_VALUE, AbstractNumericOperandParser.EQUALS_VALUE, AbstractNumericOperandParser.GREATER_THAN_VALUE, AbstractNumericOperandParser.LESS_THAN_VALUE)).build()) .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.VALUE_NID).withValue((short) 22).build()).build()) .build()).build()).build()).build()); final FlowspecBuilder expectedFS = new FlowspecBuilder(); - expectedFS.setFlowspecType(new IcmpTypeCaseBuilder().setTypes(Lists.newArrayList(new TypesBuilder().setValue((short) 22).setOp(new NumericOperand(true, true, true, true, true)).build())).build()); + expectedFS.setFlowspecType(new IcmpTypeCaseBuilder().setTypes(Lists.newArrayList(new TypesBuilder().setValue((short) 22).setOp(new NumericOperand(true, true, true, true, true)).build())).build()); final List expected = new ArrayList<>(); expected.add(expectedFS.build()); assertEquals(expected, FS_PARSER.extractFlowspec(entry.build())); @@ -660,7 +660,7 @@ public class SimpleFlowspecIpv4NlriParserTest { .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.VALUE_NID).withValue((short) 23).build()).build()) .build()).build()).build()).build()); final FlowspecBuilder expectedFS = new FlowspecBuilder(); - expectedFS.setFlowspecType(new IcmpCodeCaseBuilder().setCodes(Lists.newArrayList(new CodesBuilder().setValue((short) 23).setOp(new NumericOperand(false, false, false, false, false)).build())).build()); + expectedFS.setFlowspecType(new IcmpCodeCaseBuilder().setCodes(Lists.newArrayList(new CodesBuilder().setValue((short) 23).setOp(new NumericOperand(false, false, false, false, false)).build())).build()); final List expected = new ArrayList<>(); expected.add(expectedFS.build()); assertEquals(expected, FS_PARSER.extractFlowspec(entry.build())); @@ -678,11 +678,11 @@ public class SimpleFlowspecIpv4NlriParserTest { .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_TYPE_NID) .withChild(Builders.unkeyedListBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.TCP_FLAGS_NID) .withChild(Builders.unkeyedListEntryBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID) - .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.AND_BIT_VALUE, AbstractOperandParser.END_OF_LIST_VALUE)).build()) + .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.AND_BIT_VALUE, AbstractOperandParser.END_OF_LIST_VALUE)).build()) .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.VALUE_NID).withValue(99).build()).build()) .build()).build()).build()).build()); final FlowspecBuilder expectedFS = new FlowspecBuilder(); - expectedFS.setFlowspecType(new TcpFlagsCaseBuilder().setTcpFlags(Lists.newArrayList(new TcpFlagsBuilder().setValue(99).setOp(new BitmaskOperand(true, true, false, false)).build())).build()); + expectedFS.setFlowspecType(new TcpFlagsCaseBuilder().setTcpFlags(Lists.newArrayList(new TcpFlagsBuilder().setValue(99).setOp(new BitmaskOperand(true, true, false, false)).build())).build()); final List expected = new ArrayList<>(); expected.add(expectedFS.build()); assertEquals(expected, FS_PARSER.extractFlowspec(entry.build())); @@ -700,11 +700,11 @@ public class SimpleFlowspecIpv4NlriParserTest { .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_TYPE_NID) .withChild(Builders.unkeyedListBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.PACKET_LENGTHS_NID) .withChild(Builders.unkeyedListEntryBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID) - .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.AND_BIT_VALUE, AbstractNumericOperandParser.GREATER_THAN_VALUE)).build()) + .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.AND_BIT_VALUE, AbstractNumericOperandParser.GREATER_THAN_VALUE)).build()) .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.VALUE_NID).withValue(101).build()).build()) .build()).build()).build()).build()); final FlowspecBuilder expectedFS = new FlowspecBuilder(); - expectedFS.setFlowspecType(new PacketLengthCaseBuilder().setPacketLengths(Lists.newArrayList(new PacketLengthsBuilder().setValue(101).setOp(new NumericOperand(true, false, false, true, false)).build())).build()); + expectedFS.setFlowspecType(new PacketLengthCaseBuilder().setPacketLengths(Lists.newArrayList(new PacketLengthsBuilder().setValue(101).setOp(new NumericOperand(true, false, false, true, false)).build())).build()); final List expected = new ArrayList<>(); expected.add(expectedFS.build()); assertEquals(expected, FS_PARSER.extractFlowspec(entry.build())); @@ -722,11 +722,11 @@ public class SimpleFlowspecIpv4NlriParserTest { .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_TYPE_NID) .withChild(Builders.unkeyedListBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.DSCP_NID) .withChild(Builders.unkeyedListEntryBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID) - .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.AND_BIT_VALUE, AbstractOperandParser.END_OF_LIST_VALUE, AbstractNumericOperandParser.GREATER_THAN_VALUE)).build()) + .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.AND_BIT_VALUE, AbstractOperandParser.END_OF_LIST_VALUE, AbstractNumericOperandParser.GREATER_THAN_VALUE)).build()) .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.VALUE_NID).withValue((short) 15).build()).build()) .build()).build()).build()).build()); final FlowspecBuilder expectedFS = new FlowspecBuilder(); - expectedFS.setFlowspecType(new DscpCaseBuilder().setDscps(Lists.newArrayList(new DscpsBuilder().setValue(new Dscp((short) 15)).setOp(new NumericOperand(true, true, false, true, false)).build())).build()); + expectedFS.setFlowspecType(new DscpCaseBuilder().setDscps(Lists.newArrayList(new DscpsBuilder().setValue(new Dscp((short) 15)).setOp(new NumericOperand(true, true, false, true, false)).build())).build()); final List expected = new ArrayList<>(); expected.add(expectedFS.build()); assertEquals(expected, FS_PARSER.extractFlowspec(entry.build())); @@ -744,11 +744,11 @@ public class SimpleFlowspecIpv4NlriParserTest { .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_TYPE_NID) .withChild(Builders.unkeyedListBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.FRAGMENT_NID) .withChild(Builders.unkeyedListEntryBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID) - .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.AND_BIT_VALUE, AbstractOperandParser.END_OF_LIST_VALUE, BitmaskOperandParser.MATCH_VALUE, BitmaskOperandParser.NOT_VALUE)).build()) + .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.AND_BIT_VALUE, AbstractOperandParser.END_OF_LIST_VALUE, BitmaskOperandParser.MATCH_VALUE, BitmaskOperandParser.NOT_VALUE)).build()) .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.VALUE_NID).withValue(Sets.newHashSet(AbstractFlowspecNlriParser.DO_NOT_VALUE, AbstractFlowspecNlriParser.FIRST_VALUE, AbstractFlowspecNlriParser.IS_A_VALUE, AbstractFlowspecNlriParser.LAST_VALUE)).build()).build()) .build()).build()).build()).build()); final FlowspecBuilder expectedFS = new FlowspecBuilder(); - expectedFS.setFlowspecType(new FragmentCaseBuilder().setFragments(Lists.newArrayList(new FragmentsBuilder().setValue(new Fragment(true, true, true, true)).setOp(new BitmaskOperand(true, true, true, true)).build())).build()); + expectedFS.setFlowspecType(new FragmentCaseBuilder().setFragments(Lists.newArrayList(new FragmentsBuilder().setValue(new Fragment(true, true, true, true)).setOp(new BitmaskOperand(true, true, true, true)).build())).build()); final List expected = new ArrayList<>(); expected.add(expectedFS.build()); assertEquals(expected, FS_PARSER.extractFlowspec(entry.build())); diff --git a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv6NlriParserTest.java b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv6NlriParserTest.java index add3327ba8..2234b0a27a 100644 --- a/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv6NlriParserTest.java +++ b/bgp/flowspec/src/test/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecIpv6NlriParserTest.java @@ -329,11 +329,11 @@ public class SimpleFlowspecIpv6NlriParserTest { .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_TYPE_NID) .withChild(Builders.unkeyedListBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.FRAGMENT_NID) .withChild(Builders.unkeyedListEntryBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID) - .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.AND_BIT_VALUE, AbstractOperandParser.END_OF_LIST_VALUE, BitmaskOperandParser.MATCH_VALUE, BitmaskOperandParser.NOT_VALUE)).build()) + .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.AND_BIT_VALUE, AbstractOperandParser.END_OF_LIST_VALUE, BitmaskOperandParser.MATCH_VALUE, BitmaskOperandParser.NOT_VALUE)).build()) .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.VALUE_NID).withValue(Sets.newHashSet(AbstractFlowspecNlriParser.DO_NOT_VALUE, AbstractFlowspecNlriParser.FIRST_VALUE, AbstractFlowspecNlriParser.IS_A_VALUE, AbstractFlowspecNlriParser.LAST_VALUE)).build()).build()) .build()).build()).build()).build()); final FlowspecBuilder expectedFS = new FlowspecBuilder(); - expectedFS.setFlowspecType(new FragmentCaseBuilder().setFragments(Lists.newArrayList(new FragmentsBuilder().setValue(new Fragment(true, true, true, true)).setOp(new BitmaskOperand(true, true, true, true)).build())).build()); + expectedFS.setFlowspecType(new FragmentCaseBuilder().setFragments(Lists.newArrayList(new FragmentsBuilder().setValue(new Fragment(true, true, true, true)).setOp(new BitmaskOperand(true, true, true, true)).build())).build()); final List expectedValue = new ArrayList<>(); expectedValue.add(expectedFS.build()); assertEquals(expectedValue, FS_PARSER.extractFlowspec(entry.build())); @@ -351,18 +351,18 @@ public class SimpleFlowspecIpv6NlriParserTest { .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_TYPE_NID) .withChild(Builders.unkeyedListBuilder().withNodeIdentifier(NEXT_HEADER_NID) .withChild(Builders.unkeyedListEntryBuilder().withNodeIdentifier(NEXT_HEADER_NID) - .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.END_OF_LIST_VALUE, AbstractOperandParser.AND_BIT_VALUE)).build()) + .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.END_OF_LIST_VALUE, AbstractOperandParser.AND_BIT_VALUE)).build()) .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.VALUE_NID).withValue((short) 100).build()).build()) .withChild(Builders.unkeyedListEntryBuilder().withNodeIdentifier(NEXT_HEADER_NID) - .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.AND_BIT_VALUE)).build()) + .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.AND_BIT_VALUE)).build()) .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.VALUE_NID).withValue((short) 200).build()).build()) .withChild(Builders.unkeyedListEntryBuilder().withNodeIdentifier(NEXT_HEADER_NID) - .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.END_OF_LIST_VALUE, AbstractOperandParser.AND_BIT_VALUE, AbstractNumericOperandParser.EQUALS_VALUE)).build()) + .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.END_OF_LIST_VALUE, AbstractOperandParser.AND_BIT_VALUE, AbstractNumericOperandParser.EQUALS_VALUE)).build()) .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.VALUE_NID).withValue((short) 210).build()).build()) .build()).build()).build()).build()); final FlowspecBuilder expectedFS = new FlowspecBuilder(); - expectedFS.setFlowspecType(new NextHeaderCaseBuilder().setNextHeaders(Lists.newArrayList( + expectedFS.setFlowspecType(new NextHeaderCaseBuilder().setNextHeaders(Lists.newArrayList( new NextHeadersBuilder().setValue((short) 100).setOp(new NumericOperand(true, true, false, false, false)).build(), new NextHeadersBuilder().setValue((short) 200).setOp(new NumericOperand(true, false, false, false, false)).build(), new NextHeadersBuilder().setValue((short) 210).setOp(new NumericOperand(true, true, true, false, false)).build())).build()); @@ -383,15 +383,15 @@ public class SimpleFlowspecIpv6NlriParserTest { .withNodeIdentifier(AbstractFlowspecNlriParser.FLOWSPEC_TYPE_NID) .withChild(Builders.unkeyedListBuilder().withNodeIdentifier(FLOW_LABEL_NID) .withChild(Builders.unkeyedListEntryBuilder().withNodeIdentifier(FLOW_LABEL_NID) - .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.END_OF_LIST_VALUE, AbstractOperandParser.AND_BIT_VALUE)).build()) + .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.END_OF_LIST_VALUE, AbstractOperandParser.AND_BIT_VALUE)).build()) .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.VALUE_NID).withValue(100L).build()).build()) .withChild(Builders.unkeyedListEntryBuilder().withNodeIdentifier(FLOW_LABEL_NID) - .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.AND_BIT_VALUE)).build()) + .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.OP_NID).withValue(Sets.newHashSet(AbstractOperandParser.AND_BIT_VALUE)).build()) .withChild(Builders.leafBuilder().withNodeIdentifier(AbstractFlowspecNlriParser.VALUE_NID).withValue(200L).build()).build()) .build()).build()).build()).build()); final FlowspecBuilder expectedFS = new FlowspecBuilder(); - expectedFS.setFlowspecType(new FlowLabelCaseBuilder().setFlowLabel(Lists.newArrayList( + expectedFS.setFlowspecType(new FlowLabelCaseBuilder().setFlowLabel(Lists.newArrayList( new FlowLabelBuilder().setValue(100L).setOp(new NumericOperand(true, true, false, false, false)).build(), new FlowLabelBuilder().setValue(200L).setOp(new NumericOperand(true, false, false, false, false)).build())).build()); final List expectedValue = new ArrayList<>(); diff --git a/bgp/inet/src/main/java/org/opendaylight/protocol/bgp/inet/RIBActivator.java b/bgp/inet/src/main/java/org/opendaylight/protocol/bgp/inet/RIBActivator.java index b8c735593c..6444ff6182 100644 --- a/bgp/inet/src/main/java/org/opendaylight/protocol/bgp/inet/RIBActivator.java +++ b/bgp/inet/src/main/java/org/opendaylight/protocol/bgp/inet/RIBActivator.java @@ -20,7 +20,7 @@ public final class RIBActivator extends AbstractRIBExtensionProviderActivator { @Override protected List startRIBExtensionProviderImpl(final RIBExtensionProviderContext context) { return Lists.newArrayList( - (AutoCloseable)context.registerRIBSupport(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class, IPv4RIBSupport.getInstance()), - (AutoCloseable)context.registerRIBSupport(Ipv6AddressFamily.class, UnicastSubsequentAddressFamily.class, IPv6RIBSupport.getInstance())); + context.registerRIBSupport(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class, IPv4RIBSupport.getInstance()), + context.registerRIBSupport(Ipv6AddressFamily.class, UnicastSubsequentAddressFamily.class, IPv6RIBSupport.getInstance())); } } diff --git a/bgp/inet/src/test/java/org/opendaylight/protocol/bgp/inet/codec/BGPParserTest.java b/bgp/inet/src/test/java/org/opendaylight/protocol/bgp/inet/codec/BGPParserTest.java index 056f6b2690..e2fe086a9a 100644 --- a/bgp/inet/src/test/java/org/opendaylight/protocol/bgp/inet/codec/BGPParserTest.java +++ b/bgp/inet/src/test/java/org/opendaylight/protocol/bgp/inet/codec/BGPParserTest.java @@ -200,7 +200,7 @@ public class BGPParserTest { paBuilder.addAugmentation(Attributes1.class, new Attributes1Builder().setMpReachNlri(mpBuilder.build()).build()); assertEquals(paBuilder.getAugmentation(Attributes1.class).getMpReachNlri(), attrs.getAugmentation(Attributes1.class).getMpReachNlri()); - paBuilder.setUnrecognizedAttributes(Collections. emptyList()); + paBuilder.setUnrecognizedAttributes(Collections.emptyList()); // check API message builder.setAttributes(paBuilder.build()); diff --git a/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/ParserTest.java b/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/ParserTest.java index 5ee5cfdcf7..eec30d1298 100644 --- a/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/ParserTest.java +++ b/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/ParserTest.java @@ -380,7 +380,7 @@ public class ParserTest { paBuilder.setOrigin(new OriginBuilder().setValue(BgpOrigin.Igp).build()); assertEquals(paBuilder.getOrigin(), attrs.getOrigin()); - paBuilder.setAsPath(new AsPathBuilder().setSegments(Collections. emptyList()).build()); + paBuilder.setAsPath(new AsPathBuilder().setSegments(Collections.emptyList()).build()); assertEquals(paBuilder.getAsPath(), attrs.getAsPath()); paBuilder.setLocalPref(new LocalPrefBuilder().setPref(100L).build()); @@ -407,7 +407,7 @@ public class ParserTest { paBuilder.addAugmentation( org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev150210.Attributes1.class, lsAttrBuilder.build()); - paBuilder.setUnrecognizedAttributes(Collections. emptyList()); + paBuilder.setUnrecognizedAttributes(Collections.emptyList()); assertEquals( lsAttrBuilder.build(), @@ -571,14 +571,14 @@ public class ParserTest { paBuilder.setOrigin(new OriginBuilder().setValue(BgpOrigin.Igp).build()); assertEquals(paBuilder.getOrigin(), attrs.getOrigin()); - paBuilder.setAsPath(new AsPathBuilder().setSegments(Collections. emptyList()).build()); + paBuilder.setAsPath(new AsPathBuilder().setSegments(Collections.emptyList()).build()); assertEquals(paBuilder.getAsPath(), attrs.getAsPath()); paBuilder.setLocalPref(new LocalPrefBuilder().setPref(100L).build()); assertEquals(paBuilder.getLocalPref(), attrs.getLocalPref()); paBuilder.addAugmentation(Attributes1.class, lsBuilder.build()); - paBuilder.setUnrecognizedAttributes(Collections. emptyList()); + paBuilder.setUnrecognizedAttributes(Collections.emptyList()); final MpReachNlri mp = attrs.getAugmentation(Attributes1.class).getMpReachNlri(); assertEquals(mpBuilder.getAfi(), mp.getAfi()); diff --git a/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/SrAttributeParserTest.java b/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/SrAttributeParserTest.java index 345f7cf61d..9d6ade91ad 100644 --- a/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/SrAttributeParserTest.java +++ b/bgp/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/SrAttributeParserTest.java @@ -125,7 +125,7 @@ public class SrAttributeParserTest { public void testSrAlgorithm() { final byte[] bytes = { 0 }; final SrAlgorithm alg = new SrAlgorithmBuilder().setAlgorithms(Lists.newArrayList(Algorithm.ShortestPathFirst)).build(); - final SrAlgorithm empty = new SrAlgorithmBuilder().setAlgorithms(Collections.emptyList()).build(); + final SrAlgorithm empty = new SrAlgorithmBuilder().setAlgorithms(Collections.emptyList()).build(); assertEquals(alg, SrNodeAttributesParser.parseSrAlgorithms(Unpooled.wrappedBuffer(bytes))); final ByteBuf b = Unpooled.buffer(); assertEquals(empty, SrNodeAttributesParser.parseSrAlgorithms(b)); 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 b538314805..c93c0f7e36 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 @@ -39,7 +39,7 @@ public final class AsPathAttributeParser implements AttributeParser, AttributeSe private final ReferenceCache refCache; private static final Logger LOG = LoggerFactory.getLogger(AsPathAttributeParser.class); - private static final AsPath EMPTY = new AsPathBuilder().setSegments(Collections. emptyList()).build(); + private static final AsPath EMPTY = new AsPathBuilder().setSegments(Collections.emptyList()).build(); public AsPathAttributeParser(final ReferenceCache refCache) { this.refCache = Preconditions.checkNotNull(refCache); diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/AsPathSegmentParser.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/AsPathSegmentParser.java index 56dee6130e..dad4ebfd5b 100644 --- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/AsPathSegmentParser.java +++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/AsPathSegmentParser.java @@ -64,7 +64,7 @@ public final class AsPathSegmentParser { for (int i = 0; i < count; i++) { coll.add(refCache.getSharedReference(new AsNumber(buffer.readUnsignedInt()))); } - return (coll.isEmpty()) ? Collections.emptyList() : coll; + return (coll.isEmpty()) ? Collections.emptyList() : coll; } static void serializeAsList(final List asList, final SegmentType type, final ByteBuf byteAggregator) { diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/BGPParserTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/BGPParserTest.java index 5170e99019..8dcb718d4b 100644 --- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/BGPParserTest.java +++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/BGPParserTest.java @@ -215,7 +215,7 @@ public class BGPParserTest { paBuilder.setCommunities(comms); assertEquals(paBuilder.getCommunities(), attrs.getCommunities()); - paBuilder.setUnrecognizedAttributes(Collections. emptyList()); + paBuilder.setUnrecognizedAttributes(Collections.emptyList()); builder.setAttributes(paBuilder.build()); @@ -315,7 +315,7 @@ public class BGPParserTest { paBuilder.setAggregator(aggregator); assertEquals(paBuilder.getAggregator(), attrs.getAggregator()); - paBuilder.setUnrecognizedAttributes(Collections. emptyList()); + paBuilder.setUnrecognizedAttributes(Collections.emptyList()); builder.setAttributes(paBuilder.build()); assertEquals(builder.build(), message); @@ -402,7 +402,7 @@ public class BGPParserTest { paBuilder.setOrigin(new OriginBuilder().setValue(BgpOrigin.Egp).build()); assertEquals(paBuilder.getOrigin(), attrs.getOrigin()); - paBuilder.setAsPath(new AsPathBuilder().setSegments(Collections. emptyList()).build()); + paBuilder.setAsPath(new AsPathBuilder().setSegments(Collections.emptyList()).build()); assertEquals(paBuilder.getAsPath(), attrs.getAsPath()); paBuilder.setCNextHop(nextHop); @@ -417,7 +417,7 @@ public class BGPParserTest { paBuilder.setExtendedCommunities(comms); assertEquals(paBuilder.getExtendedCommunities(), attrs.getExtendedCommunities()); - paBuilder.setUnrecognizedAttributes(Collections. emptyList()); + paBuilder.setUnrecognizedAttributes(Collections.emptyList()); // check API message builder.setAttributes(paBuilder.build()); assertEquals(builder.build(), message); diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/GracefulCapabilityHandlerTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/GracefulCapabilityHandlerTest.java index 4d80a38217..03c2763139 100644 --- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/GracefulCapabilityHandlerTest.java +++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/GracefulCapabilityHandlerTest.java @@ -101,7 +101,7 @@ public class GracefulCapabilityHandlerTest { }; capaBuilder.setRestartFlags(new RestartFlags(false)); capaBuilder.setRestartTime(0); - capaBuilder.setTables(Collections.emptyList()); + capaBuilder.setTables(Collections.emptyList()); Assert.assertEquals( new CParametersBuilder().addAugmentation(CParameters1.class, new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build()).build(), handler.parseCapability(Unpooled.wrappedBuffer(capaBytes3).slice(2, capaBytes3.length - 2))); @@ -123,7 +123,7 @@ public class GracefulCapabilityHandlerTest { Assert.assertArrayEquals(capaBytes5, b.array()); Assert.assertEquals(new CParametersBuilder().addAugmentation(CParameters1.class, new CParameters1Builder() .setGracefulRestartCapability(new GracefulRestartCapabilityBuilder().setRestartFlags(new RestartFlags(Boolean.FALSE)) - .setRestartTime(0).setTables(Collections.emptyList()).build()).build()).build(), + .setRestartTime(0).setTables(Collections.emptyList()).build()).build()).build(), handler.parseCapability(Unpooled.wrappedBuffer(capaBytes5).slice(2, capaBytes5.length - 2))); } diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/UnrecognizedAttributesSerializerTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/UnrecognizedAttributesSerializerTest.java index 35f861d81a..e1016101b7 100755 --- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/UnrecognizedAttributesSerializerTest.java +++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/UnrecognizedAttributesSerializerTest.java @@ -39,7 +39,7 @@ public class UnrecognizedAttributesSerializerTest { final Attributes attrs = new AttributesBuilder().setUnrecognizedAttributes(unrecognizedAttrs).build(); final ByteBuf buffer = Unpooled.buffer(); - ServiceLoaderBGPExtensionProviderContext.getSingletonInstance().getAttributeRegistry().serializeAttribute((DataObject) attrs, buffer); + ServiceLoaderBGPExtensionProviderContext.getSingletonInstance().getAttributeRegistry().serializeAttribute(attrs, buffer); assertArrayEquals(unrecognizedBytes, ByteArray.readAllBytes(buffer)); } } 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 604bb4bf5b..bf04708df8 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 @@ -57,19 +57,19 @@ public final class BestPathStateImpl implements BestPathState { NamespaceSpecificIds(final QName namespace) { NodeIdentifier container = new NodeIdentifier(QName.create(namespace, AsPath.QNAME.getLocalName().intern())); NodeIdentifier leaf = new NodeIdentifier(QName.create(namespace, "segments").intern()); - this.asPath = ImmutableList.of(container, leaf); + this.asPath = ImmutableList.of(container, leaf); container = new NodeIdentifier(QName.create(namespace, LocalPref.QNAME.getLocalName()).intern()); leaf = new NodeIdentifier(QName.create(namespace, "pref").intern()); - this.locPref = ImmutableList.of(container, leaf); + this.locPref = ImmutableList.of(container, leaf); container = new NodeIdentifier(QName.create(namespace, MultiExitDisc.QNAME.getLocalName()).intern()); leaf = new NodeIdentifier(QName.create(namespace, "med").intern()); - this.med = ImmutableList.of(container, leaf); + this.med = ImmutableList.of(container, leaf); container = new NodeIdentifier(QName.create(namespace, Origin.QNAME.getLocalName()).intern()); leaf = new NodeIdentifier(QName.create(namespace, "value").intern()); - this.orig = ImmutableList.of(container, leaf); + this.orig = ImmutableList.of(container, leaf); this.asSetNid = new NodeIdentifier(QName.create(namespace, "as-set").intern()); this.asSeqNid = new NodeIdentifier(QName.create(namespace, "as-sequence").intern()); @@ -152,21 +152,21 @@ public final class BestPathStateImpl implements BestPathState { final Optional> maybeLocalPref = NormalizedNodes.findNode(this.attributes, this.ids.getLocPref()); if (maybeLocalPref.isPresent()) { - this.localPref = (Long) ((LeafNode)maybeLocalPref.get()).getValue(); + this.localPref = (Long) maybeLocalPref.get().getValue(); } else { this.localPref = null; } final Optional> maybeMultiExitDisc = NormalizedNodes.findNode(this.attributes, this.ids.getMed()); if (maybeMultiExitDisc.isPresent()) { - this.multiExitDisc = (Long) ((LeafNode)maybeMultiExitDisc.get()).getValue(); + this.multiExitDisc = (Long) maybeMultiExitDisc.get().getValue(); } else { this.multiExitDisc = null; } final Optional> maybeOrigin = NormalizedNodes.findNode(this.attributes, this.ids.getOrig()); if (maybeOrigin.isPresent()) { - this.origin = fromString((String) ((LeafNode)maybeOrigin.get()).getValue()); + this.origin = fromString((String) maybeOrigin.get().getValue()); } else { this.origin = null; } diff --git a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/spi/AbstractBestPathSelector.java b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/spi/AbstractBestPathSelector.java index 2664ca8e9a..84e2546e54 100644 --- a/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/spi/AbstractBestPathSelector.java +++ b/bgp/path-selection-mode/src/main/java/org/opendaylight/protocol/bgp/mode/spi/AbstractBestPathSelector.java @@ -24,7 +24,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodes; public class AbstractBestPathSelector { - private static final Collection ORIGINATOR_ID = ImmutableList.of(new + private static final Collection ORIGINATOR_ID = ImmutableList.of(new YangInstanceIdentifier.NodeIdentifier(OriginatorId.QNAME), new YangInstanceIdentifier.NodeIdentifier(QName.create(OriginatorId.QNAME, "originator"))); private final Long ourAs; 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 fff71369cb..7edaa8903c 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 @@ -141,18 +141,18 @@ final class AdjRibOutListener implements ClusteredDOMDataTreeChangeListener, Pre private Update withdraw(final MapEntryNode route) { this.routeCounter.decrement(); if (!this.mpSupport) { - return buildUpdate(Collections.emptyList(), Collections.singleton(route), routeAttributes(route)); + return buildUpdate(Collections.emptyList(), Collections.singleton(route), routeAttributes(route)); } - return this.support.buildUpdate(Collections.emptyList(), Collections.singleton(route), routeAttributes(route)); + return this.support.buildUpdate(Collections.emptyList(), Collections.singleton(route), routeAttributes(route)); } private Update advertise(final MapEntryNode route) { this.routeCounter.increment(); this.prefixesSentCounter.increment(); if (!this.mpSupport) { - return buildUpdate(Collections.singleton(route), Collections.emptyList(), routeAttributes(route)); + return buildUpdate(Collections.singleton(route), Collections.emptyList(), routeAttributes(route)); } - return this.support.buildUpdate(Collections.singleton(route), Collections.emptyList(), routeAttributes(route)); + return this.support.buildUpdate(Collections.singleton(route), Collections.emptyList(), routeAttributes(route)); } private Update buildUpdate(@Nonnull final Collection advertised, @Nonnull final Collection withdrawn, @Nonnull final Attributes attr) { diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AttributeOperations.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AttributeOperations.java index 62832936ce..6dbb82a773 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AttributeOperations.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AttributeOperations.java @@ -98,10 +98,10 @@ final class AttributeOperations { this.clusterListContainer = new NodeIdentifier(QName.create(namespace, ClusterId.QNAME.getLocalName()).intern()); this.clusterQname = QName.create(namespace, "cluster").intern(); this.clusterListLeaf = new NodeIdentifier(this.clusterQname); - this.clusterListPath = ImmutableList.of(this.clusterListContainer, this.clusterListLeaf); + this.clusterListPath = ImmutableList.of(this.clusterListContainer, this.clusterListLeaf); this.originatorIdContainer = new NodeIdentifier(QName.create(namespace, OriginatorId.QNAME.getLocalName()).intern()); this.originatorIdLeaf = new NodeIdentifier(QName.create(namespace, "originator").intern()); - this.originatorIdPath = ImmutableList.of(this.originatorIdContainer, this.originatorIdLeaf); + this.originatorIdPath = ImmutableList.of(this.originatorIdContainer, this.originatorIdLeaf); this.transitiveLeaf = new NodeIdentifier(QName.create(UnrecognizedAttributes.QNAME, "transitive").intern()); this.transitiveCollection = TRANSITIVE_CACHE.getUnchecked(namespace); @@ -334,7 +334,7 @@ final class AttributeOperations { final NormalizedNode originatorId = maybeOriginatorId.get(); if (originatorId instanceof LeafNode) { - return ((LeafNode) originatorId).getValue(); + return originatorId.getValue(); } LOG.warn("Unexpected ORIGINATOR_ID node {}, ignoring it", originatorId); 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 6d81483576..04cec26c2e 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 @@ -192,7 +192,7 @@ public class BGPSessionImpl extends SimpleChannelInboundHandler im }, this.keepAlive, TimeUnit.SECONDS); } this.bgpId = remoteOpen.getBgpIdentifier(); - this.sessionStats = new BGPSessionStatsImpl(this, remoteOpen, this.holdTimerValue, this.keepAlive, channel, Optional.absent(), + this.sessionStats = new BGPSessionStatsImpl(this, remoteOpen, this.holdTimerValue, this.keepAlive, channel, Optional.absent(), this.tableTypes, this.addPathTypes); this.sessionState.advertizeCapabilities(this.holdTimerValue, channel.remoteAddress(), channel.localAddress(), diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModuleTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModuleTest.java index 0b82eb12e5..d283fe6d97 100755 --- a/bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModuleTest.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModuleTest.java @@ -128,7 +128,7 @@ public class BGPPeerModuleTest extends AbstractRIBImplModuleTest { mxBean.setPeerRegistry(createPeerRegistry(transaction)); mxBean.setHost(host); mxBean.setPort(port); - mxBean.setAdvertizedTable(Collections.emptyList()); + mxBean.setAdvertizedTable(Collections.emptyList()); mxBean.setRouteRefresh(false); { final ObjectName ribON = createRIBImplModuleInstance(transaction); diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionImplTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionImplTest.java index 8ad8d9e38b..6597ee9893 100644 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionImplTest.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/BGPSessionImplTest.java @@ -115,7 +115,7 @@ public class BGPSessionImplTest { tlvs.add(new BgpParametersBuilder().setOptionalCapabilities(capa).build()); final ChannelFuture f = mock(ChannelFuture.class); - doReturn(null).when(f).addListener(Mockito.>>any()); + doReturn(null).when(f).addListener(Mockito.any()); doAnswer(new Answer() { @Override @@ -146,7 +146,7 @@ public class BGPSessionImplTest { doReturn(null).when(this.pipeline).replace(Matchers.>any(), Mockito.any(String.class), Mockito.any(ChannelHandler.class)); doReturn(this.pipeline).when(this.pipeline).addLast(Mockito.any(ChannelHandler.class)); final ChannelFuture futureChannel = mock(ChannelFuture.class); - doReturn(null).when(futureChannel).addListener(Mockito.>>any()); + doReturn(null).when(futureChannel).addListener(Mockito.any()); doReturn(futureChannel).when(this.speakerListener).close(); this.listener = new SimpleSessionListener(); this.bgpSession = new BGPSessionImpl(this.listener, this.speakerListener, this.classicOpen, this.classicOpen.getHoldTimer(), null); 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 c5bb5576dc..4e90b99b23 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 @@ -113,7 +113,7 @@ public class FSMTest { tlvs.add(new BgpParametersBuilder().setOptionalCapabilities(capas).build()); final BGPSessionPreferences prefs = new BGPSessionPreferences(new AsNumber(30L), (short) 3, new BgpId("1.1.1.1"), new AsNumber(30L), tlvs, - Optional.absent()); + Optional.absent()); final ChannelFuture f = mock(ChannelFuture.class); doReturn(null).when(f).addListener(any(GenericFutureListener.class)); diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistryTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistryTest.java index 905c802e89..154b79770f 100644 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistryTest.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistryTest.java @@ -61,8 +61,8 @@ public class StrictBGPPeerRegistryTest { @Before public void setUp() throws Exception { this.peerRegistry = new StrictBGPPeerRegistry(); - this.mockPreferences = new BGPSessionPreferences(LOCAL_AS, 1, new BgpId("0.0.0.1"), LOCAL_AS, Collections. emptyList(), - Optional.absent()); + this.mockPreferences = new BGPSessionPreferences(LOCAL_AS, 1, new BgpId("0.0.0.1"), LOCAL_AS, Collections.emptyList(), + Optional.absent()); } private static BGPSessionListener getMockSession() { diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RibSupportUtils.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RibSupportUtils.java index 51dbeb111b..6594712330 100644 --- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RibSupportUtils.java +++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RibSupportUtils.java @@ -50,7 +50,7 @@ public final class RibSupportUtils { * @return NodeIdentifierWithPredicates of 'id' for specified AFI, SAFI combination. */ public static NodeIdentifierWithPredicates toYangKey(final QName id, final Class afi, final Class safi) { - final ImmutableMap keyValues = ImmutableMap.of( + final ImmutableMap keyValues = ImmutableMap.of( AFI_QNAME, BindingReflections.findQName(afi), SAFI_QNAME, BindingReflections.findQName(safi)); return new NodeIdentifierWithPredicates(id, keyValues); @@ -67,7 +67,7 @@ public final class RibSupportUtils { */ public static NodeIdentifierWithPredicates toYangPathKey(final QName id, final Class afi, final Class safi) { - final ImmutableMap keyValues = ImmutableMap.of( + final ImmutableMap keyValues = ImmutableMap.of( ADD_PATH_AFI_QNAME, BindingReflections.findQName(afi), ADD_PATH_SAFI_QNAME, BindingReflections.findQName(safi)); return new NodeIdentifierWithPredicates(id, keyValues); 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 111f48ca82..b10fdce981 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 @@ -115,7 +115,7 @@ abstract class AbstractReachabilityTopologyBuilder extends Abst trans.merge(LogicalDatastoreType.OPERATIONAL, nii, new NodeBuilder().setKey(nii.getKey()).setNodeId(ni) .addAugmentation(Node1.class, new Node1Builder().setIgpNodeAttributes( - new IgpNodeAttributesBuilder().setPrefix(Collections.emptyList()).build()).build()).build()); + new IgpNodeAttributesBuilder().setPrefix(Collections.emptyList()).build()).build()).build()); this.nodes.put(ni, new NodeUsage(ret)); return ret; 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 de1070ab83..1a7aaa821f 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 @@ -233,7 +233,7 @@ public abstract class AbstractTopologyBuilder implements AutoCl final WriteTransaction trans = this.chain.newWriteOnlyTransaction(); trans.put(LogicalDatastoreType.OPERATIONAL, this.topology, new TopologyBuilder().setKey(this.topologyKey).setServerProvided(Boolean.TRUE).setTopologyTypes(this.topologyTypes) - .setLink(Collections.emptyList()).setNode(Collections.emptyList()).build(), true); + .setLink(Collections.emptyList()).setNode(Collections.emptyList()).build(), true); Futures.addCallback(trans.submit(), new FutureCallback() { @Override public void onSuccess(final Void result) { 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 9700e25182..3132da9297 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 @@ -44,7 +44,7 @@ public abstract class AbstractTopologyBuilderTest extends AbstractDataBrokerTest protected void createEmptyTopology() { final WriteTransaction wTx = getDataBroker().newWriteOnlyTransaction(); - wTx.put(LogicalDatastoreType.OPERATIONAL, InstanceIdentifier.builder(NetworkTopology.class).build(), new NetworkTopologyBuilder().setTopology(Collections.emptyList()).build()); + wTx.put(LogicalDatastoreType.OPERATIONAL, InstanceIdentifier.builder(NetworkTopology.class).build(), new NetworkTopologyBuilder().setTopology(Collections.emptyList()).build()); wTx.submit(); } diff --git a/data-change-counter/src/test/java/org/opendaylight/controller/config/yang/bgpcep/data/change/counter/DataChangeCounterImplModuleTest.java b/data-change-counter/src/test/java/org/opendaylight/controller/config/yang/bgpcep/data/change/counter/DataChangeCounterImplModuleTest.java index f3ef364ab5..b166bfc6a6 100644 --- a/data-change-counter/src/test/java/org/opendaylight/controller/config/yang/bgpcep/data/change/counter/DataChangeCounterImplModuleTest.java +++ b/data-change-counter/src/test/java/org/opendaylight/controller/config/yang/bgpcep/data/change/counter/DataChangeCounterImplModuleTest.java @@ -63,9 +63,9 @@ public class DataChangeCounterImplModuleTest extends AbstractConfigTest { public void setUp() throws Exception { Mockito.doNothing().when(this.registration).close(); Mockito.doReturn(null).when(this.wTx).submit(); - Mockito.doNothing().when(this.wTx).put(Mockito.any(LogicalDatastoreType.class), Mockito.>any(), Mockito.any(DataChangeCounter.class)); + Mockito.doNothing().when(this.wTx).put(Mockito.any(LogicalDatastoreType.class), Mockito.any(), Mockito.any(DataChangeCounter.class)); Mockito.doReturn(this.registration).when(this.dataBroker).registerDataTreeChangeListener(Mockito.any(DataTreeIdentifier.class), Mockito.any(ClusteredDataTreeChangeListener.class)); - Mockito.doNothing().when(this.wTx).delete(Mockito.any(LogicalDatastoreType.class), Mockito.>any()); + Mockito.doNothing().when(this.wTx).delete(Mockito.any(LogicalDatastoreType.class), Mockito.any()); Mockito.doReturn(this.chain).when(this.dataBroker).createTransactionChain(Mockito.any(TransactionChainListener.class)); Mockito.doReturn(this.wTx).when(this.chain).newWriteOnlyTransaction(); Mockito.doReturn(this.wTx).when(this.dataBroker).newWriteOnlyTransaction(); diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/PcepRpcServicesRoutingTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/PcepRpcServicesRoutingTest.java index 214788b726..3a9ff27b38 100644 --- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/PcepRpcServicesRoutingTest.java +++ b/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/PcepRpcServicesRoutingTest.java @@ -231,11 +231,11 @@ public class PcepRpcServicesRoutingTest extends AbstractPcepOsgiTest { final ListenableFuture future = Futures.immediateFuture(RpcResultBuilder.success().build()); final ListenableFuture futureSyncTrigger = Futures.immediateFuture(RpcResultBuilder.success().build()); - when(pcepService.addLsp(Mockito.any())).thenReturn(future); - when(pcepService.removeLsp(Mockito.any())).thenReturn(future); - when(pcepService.triggerSync(Mockito.any())).thenReturn(futureSyncTrigger); - when(pcepService.ensureLspOperational(Mockito.any())).thenReturn(future); - when(pcepService.updateLsp(Mockito.any())).thenReturn(future); + when(pcepService.addLsp(Mockito.any())).thenReturn(future); + when(pcepService.removeLsp(Mockito.any())).thenReturn(future); + when(pcepService.triggerSync(Mockito.any())).thenReturn(futureSyncTrigger); + when(pcepService.ensureLspOperational(Mockito.any())).thenReturn(future); + when(pcepService.updateLsp(Mockito.any())).thenReturn(future); } @@ -353,11 +353,11 @@ public class PcepRpcServicesRoutingTest extends AbstractPcepOsgiTest { @SuppressWarnings("rawtypes") final ListenableFuture future = Futures.immediateFuture(RpcResultBuilder.success().build()); final ListenableFuture futureTriggerSync = Futures.immediateFuture(RpcResultBuilder.success().build()); - when(pcepService.submitAddLsp(Mockito.any())).thenReturn(future); - when(pcepService.submitRemoveLsp(Mockito.any())).thenReturn(future); - when(pcepService.submitTriggerSync(Mockito.any())).thenReturn(futureTriggerSync); - when(pcepService.submitEnsureLspOperational(Mockito.any())).thenReturn(future); - when(pcepService.submitUpdateLsp(Mockito.any())).thenReturn(future); + when(pcepService.submitAddLsp(Mockito.any())).thenReturn(future); + when(pcepService.submitRemoveLsp(Mockito.any())).thenReturn(future); + when(pcepService.submitTriggerSync(Mockito.any())).thenReturn(futureTriggerSync); + when(pcepService.submitEnsureLspOperational(Mockito.any())).thenReturn(future); + when(pcepService.submitUpdateLsp(Mockito.any())).thenReturn(future); } @Test @@ -454,9 +454,9 @@ public class PcepRpcServicesRoutingTest extends AbstractPcepOsgiTest { private void initMock(final TopologyTunnelPcepProgrammingService pcepService) { @SuppressWarnings("rawtypes") final ListenableFuture future = Futures.immediateFuture(RpcResultBuilder.success().build()); - when(pcepService.pcepCreateP2pTunnel(Mockito.any())).thenReturn(future); - when(pcepService.pcepDestroyTunnel(Mockito.any())).thenReturn(future); - when(pcepService.pcepUpdateTunnel(Mockito.any())).thenReturn(future); + when(pcepService.pcepCreateP2pTunnel(Mockito.any())).thenReturn(future); + when(pcepService.pcepDestroyTunnel(Mockito.any())).thenReturn(future); + when(pcepService.pcepUpdateTunnel(Mockito.any())).thenReturn(future); } } diff --git a/pcep/auto-bandwidth-extension/src/test/java/org/opendaylight/protocol/pcep/auto/bandwidth/extension/PcRptMessageCodecTest.java b/pcep/auto-bandwidth-extension/src/test/java/org/opendaylight/protocol/pcep/auto/bandwidth/extension/PcRptMessageCodecTest.java index cc56bf1ad7..7b6985ea00 100644 --- a/pcep/auto-bandwidth-extension/src/test/java/org/opendaylight/protocol/pcep/auto/bandwidth/extension/PcRptMessageCodecTest.java +++ b/pcep/auto-bandwidth-extension/src/test/java/org/opendaylight/protocol/pcep/auto/bandwidth/extension/PcRptMessageCodecTest.java @@ -91,8 +91,8 @@ public class PcRptMessageCodecTest { final LspIdentifiers identifier = new LspIdentifiersBuilder().setAddressFamily(afiLsp).setLspId(lspId).setTunnelId(tunnelId).build(); final Lsp lsp = new LspBuilder().setPlspId(new PlspId(1L)).setTlvs(new TlvsBuilder().setLspIdentifiers(identifier).build()).build(); final Ero ero = new EroBuilder().build(); - final List objects = Lists.newArrayList(lsp, ero, bw); - final Reports validReports = codec.getValidReports(objects, Collections.emptyList()); + final List objects = Lists.newArrayList(lsp, ero, bw); + final Reports validReports = codec.getValidReports(objects, Collections.emptyList()); assertNotNull(validReports.getPath().getBandwidth().getAugmentation(Bandwidth1.class)); assertTrue(objects.isEmpty()); } @@ -126,7 +126,7 @@ public class PcRptMessageCodecTest { @Test public void testReportMsgWithRro() throws PCEPDeserializerException { final byte[] parseHexBinary = DatatypeConverter.parseHexBinary("2010003c0084a019001100106e79636e7932316372735f7432313231001200100a0000d2004008490a0000d40a0000d4001f0006000005dd700000000710001401080a000706200001080a0000d420000910001400000000000000000000000005050100051000084998968005500008513a43b70810002401080a0000d42020030801010000000001080a00070620000308010100000000"); - final Pcrpt msg = (Pcrpt) this.ctx.getMessageHandlerRegistry().parseMessage(10, Unpooled.wrappedBuffer(parseHexBinary), Collections.emptyList()); + final Pcrpt msg = (Pcrpt) this.ctx.getMessageHandlerRegistry().parseMessage(10, Unpooled.wrappedBuffer(parseHexBinary), Collections.emptyList()); Assert.assertNotNull(msg.getPcrptMessage().getReports().get(0).getPath().getBandwidth().getAugmentation(Bandwidth1.class)); } diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPErrorMessageParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPErrorMessageParser.java index 64d000d216..a2404346e5 100644 --- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPErrorMessageParser.java +++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPErrorMessageParser.java @@ -98,7 +98,7 @@ public class PCEPErrorMessageParser extends AbstractMessageParser { } else if (obj instanceof Rp) { final Rp o = (Rp) obj; if (o.isProcessingRule()) { - errors.add(createErrorMsg(PCEPErrors.P_FLAG_NOT_SET, Optional.absent())); + errors.add(createErrorMsg(PCEPErrors.P_FLAG_NOT_SET, Optional.absent())); return null; } requestParameters.add(new RpsBuilder().setRp(o).build()); diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPMonitoringReplyMessageParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPMonitoringReplyMessageParser.java index 4fafc27ca3..81e4def6db 100644 --- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPMonitoringReplyMessageParser.java +++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPMonitoringReplyMessageParser.java @@ -96,7 +96,7 @@ public class PCEPMonitoringReplyMessageParser extends AbstractMessageParser { throw new PCEPDeserializerException("Pcmonrep message cannot be empty."); } if (!(objects.get(0) instanceof Monitoring)) { - errors.add(createErrorMsg(PCEPErrors.MONITORING_OBJECT_MISSING, Optional.absent())); + errors.add(createErrorMsg(PCEPErrors.MONITORING_OBJECT_MISSING, Optional.absent())); return null; } final PcmonrepMessageBuilder builder = new PcmonrepMessageBuilder(); diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPMonitoringRequestMessageParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPMonitoringRequestMessageParser.java index dc11799a8c..80a3dd460f 100644 --- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPMonitoringRequestMessageParser.java +++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPMonitoringRequestMessageParser.java @@ -64,7 +64,7 @@ public class PCEPMonitoringRequestMessageParser extends PCEPRequestMessageParser } final MonitoringRequest monReq = getMonitoring(objects); if (monReq == null) { - errors.add(createErrorMsg(PCEPErrors.MONITORING_OBJECT_MISSING, Optional.absent())); + errors.add(createErrorMsg(PCEPErrors.MONITORING_OBJECT_MISSING, Optional.absent())); } final PcreqMessageBuilder mBuilder = new PcreqMessageBuilder(); mBuilder.setMonitoringRequest(monReq); diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPNotificationMessageParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPNotificationMessageParser.java index fc084e53d9..b3cbdf4a25 100644 --- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPNotificationMessageParser.java +++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPNotificationMessageParser.java @@ -114,7 +114,7 @@ public class PCEPNotificationMessageParser extends AbstractMessageParser { if (obj instanceof Rp) { final Rp rp = (Rp) obj; if (rp.isProcessingRule()) { - errors.add(createErrorMsg(PCEPErrors.P_FLAG_NOT_SET, Optional.absent())); + errors.add(createErrorMsg(PCEPErrors.P_FLAG_NOT_SET, Optional.absent())); return null; } requestParameters.add(new RpsBuilder().setRp(rp).build()); diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPReplyMessageParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPReplyMessageParser.java index f174296fbc..e02439973a 100644 --- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPReplyMessageParser.java +++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPReplyMessageParser.java @@ -167,7 +167,7 @@ public class PCEPReplyMessageParser extends AbstractMessageParser { protected Replies getValidReply(final List objects, final List errors) throws PCEPDeserializerException { Object object = objects.remove(0); if (!(object instanceof Rp)) { - errors.add(createErrorMsg(PCEPErrors.RP_MISSING, Optional.absent())); + errors.add(createErrorMsg(PCEPErrors.RP_MISSING, Optional.absent())); return null; } final Rp rp = (Rp) object; diff --git a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPRequestMessageParser.java b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPRequestMessageParser.java index 3f93e7e1e9..18d1d2dfd6 100644 --- a/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPRequestMessageParser.java +++ b/pcep/base-parser/src/main/java/org/opendaylight/protocol/pcep/parser/message/PCEPRequestMessageParser.java @@ -168,7 +168,7 @@ public class PCEPRequestMessageParser extends AbstractMessageParser { if (requests != null) { mBuilder.setRequests(requests); } else { - errors.add(createErrorMsg(PCEPErrors.RP_MISSING, Optional.absent())); + errors.add(createErrorMsg(PCEPErrors.RP_MISSING, Optional.absent())); } if (!objects.isEmpty()) { throw new PCEPDeserializerException("Unprocessed Objects: " + objects); @@ -196,13 +196,13 @@ public class PCEPRequestMessageParser extends AbstractMessageParser { Rp rpObj = null; if (!(objects.get(0) instanceof Rp)) { // if RP obj is missing return error only - errors.add(createErrorMsg(PCEPErrors.RP_MISSING, Optional.absent())); + errors.add(createErrorMsg(PCEPErrors.RP_MISSING, Optional.absent())); return null; } rpObj = (Rp) objects.get(0); objects.remove(0); if (!rpObj.isProcessingRule()) { - errors.add(createErrorMsg(PCEPErrors.P_FLAG_NOT_SET, Optional.absent())); + errors.add(createErrorMsg(PCEPErrors.P_FLAG_NOT_SET, Optional.absent())); } else { rBuilder.setRp(rpObj); } diff --git a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/PathBindingTlvParser.java b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/PathBindingTlvParser.java index 343bbd3fec..2f6b8a043d 100644 --- a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/PathBindingTlvParser.java +++ b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/PathBindingTlvParser.java @@ -56,9 +56,9 @@ public final class PathBindingTlvParser implements TlvParser, TlvSerializer { static { final MplsLabelCodec mplsLabelCodec = new MplsLabelCodec(); final MplsLabelEntryCodec mplsLabelEntryCodec = new MplsLabelEntryCodec(); - final Builder parsers = ImmutableMap.builder(); + final Builder parsers = ImmutableMap.builder(); final Builder, PathBindingTlvCodec> serializers = - ImmutableMap., PathBindingTlvCodec>builder(); + ImmutableMap.builder(); parsers.put(mplsLabelCodec.getBindingType(), mplsLabelCodec); serializers.put(MplsLabel.class, mplsLabelCodec); diff --git a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07ErrorMessageParser.java b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07ErrorMessageParser.java index 48ae2a5675..aeb91de6d3 100644 --- a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07ErrorMessageParser.java +++ b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07ErrorMessageParser.java @@ -85,7 +85,7 @@ public final class Stateful07ErrorMessageParser extends PCEPErrorMessageParser { } else if (obj instanceof Rp) { final Rp o = (Rp) obj; if (o.isProcessingRule()) { - errors.add(createErrorMsg(PCEPErrors.P_FLAG_NOT_SET, Optional.absent())); + errors.add(createErrorMsg(PCEPErrors.P_FLAG_NOT_SET, Optional.absent())); return null; } requestParameters.add(new RpsBuilder().setRp(o).build()); diff --git a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07PCReportMessageParser.java b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07PCReportMessageParser.java index 60d3744e62..3ecd13044d 100644 --- a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07PCReportMessageParser.java +++ b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07PCReportMessageParser.java @@ -139,14 +139,14 @@ public class Stateful07PCReportMessageParser extends AbstractMessageParser { final Lsp lsp = (Lsp) object; final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.lsp.object.lsp.Tlvs tlvs = lsp.getTlvs(); if (!lspViaSR && lsp.getPlspId().getValue() != 0 && (tlvs == null || tlvs.getLspIdentifiers() == null)) { - final Message errorMsg = createErrorMsg(PCEPErrors.LSP_IDENTIFIERS_TLV_MISSING, Optional.absent()); + final Message errorMsg = createErrorMsg(PCEPErrors.LSP_IDENTIFIERS_TLV_MISSING, Optional.absent()); errors.add(errorMsg); return false; } else { builder.setLsp(lsp); } } else { - errors.add(createErrorMsg(PCEPErrors.LSP_MISSING, Optional.absent())); + errors.add(createErrorMsg(PCEPErrors.LSP_MISSING, Optional.absent())); return false; } return true; @@ -158,7 +158,7 @@ public class Stateful07PCReportMessageParser extends AbstractMessageParser { if (object instanceof Ero) { pBuilder.setEro((Ero) object); } else { - errors.add(createErrorMsg(PCEPErrors.ERO_MISSING, Optional.absent())); + errors.add(createErrorMsg(PCEPErrors.ERO_MISSING, Optional.absent())); return false; } parsePath(objects, pBuilder); diff --git a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07PCUpdateRequestMessageParser.java b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07PCUpdateRequestMessageParser.java index dcb250a5d6..e0d75ad9e6 100644 --- a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07PCUpdateRequestMessageParser.java +++ b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07PCUpdateRequestMessageParser.java @@ -112,7 +112,7 @@ public class Stateful07PCUpdateRequestMessageParser extends AbstractMessageParse object = objects.remove(0); } } else { - errors.add(createErrorMsg(PCEPErrors.SRP_MISSING, Optional.absent())); + errors.add(createErrorMsg(PCEPErrors.SRP_MISSING, Optional.absent())); } if (validateLsp(object, errors, builder)) { @@ -131,7 +131,7 @@ public class Stateful07PCUpdateRequestMessageParser extends AbstractMessageParse if (object instanceof Lsp) { builder.setLsp((Lsp) object); } else { - errors.add(createErrorMsg(PCEPErrors.LSP_MISSING, Optional.absent())); + errors.add(createErrorMsg(PCEPErrors.LSP_MISSING, Optional.absent())); return false; } return true; @@ -143,7 +143,7 @@ public class Stateful07PCUpdateRequestMessageParser extends AbstractMessageParse if (object instanceof Ero) { pBuilder.setEro((Ero) object); } else { - errors.add(createErrorMsg(PCEPErrors.ERO_MISSING, Optional.absent())); + errors.add(createErrorMsg(PCEPErrors.ERO_MISSING, Optional.absent())); return false; } parsePath(objects, pBuilder); diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPValidatorTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPValidatorTest.java index dbf4a56b3d..6d23cfc80d 100644 --- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPValidatorTest.java +++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/PCEPValidatorTest.java @@ -322,7 +322,7 @@ public class PCEPValidatorTest { builder.setOpen(b.build()); assertEquals(new OpenBuilder().setOpenMessage(builder.build()).build(), parser.parseMessage(result.slice(4, - result.readableBytes() - 4), Collections. emptyList())); + result.readableBytes() - 4), Collections.emptyList())); final ByteBuf buf = Unpooled.buffer(result.readableBytes()); parser.serializeMessage(new OpenBuilder().setOpenMessage(builder.build()).build(), buf); assertArrayEquals(result.array(), buf.array()); @@ -341,7 +341,7 @@ public class PCEPValidatorTest { final PCEPKeepAliveMessageParser parser = new PCEPKeepAliveMessageParser(this.objectRegistry); final KeepaliveBuilder builder = new KeepaliveBuilder().setKeepaliveMessage(new KeepaliveMessageBuilder().build()); - assertEquals(builder.build(), parser.parseMessage(result.slice(4, result.readableBytes() - 4), Collections. emptyList())); + assertEquals(builder.build(), parser.parseMessage(result.slice(4, result.readableBytes() - 4), Collections.emptyList())); final ByteBuf buf = Unpooled.buffer(result.readableBytes()); parser.serializeMessage(builder.build(), buf); assertArrayEquals(result.array(), buf.array()); @@ -353,7 +353,7 @@ public class PCEPValidatorTest { final PCEPStartTLSMessageParser parser = new PCEPStartTLSMessageParser(this.objectRegistry); final StarttlsBuilder builder = new StarttlsBuilder().setStartTlsMessage(new StartTlsMessageBuilder().build()); - assertEquals(builder.build(), parser.parseMessage(result.slice(4, result.readableBytes() - 4), Collections. emptyList())); + assertEquals(builder.build(), parser.parseMessage(result.slice(4, result.readableBytes() - 4), Collections.emptyList())); final ByteBuf buf = Unpooled.buffer(result.readableBytes()); parser.serializeMessage(builder.build(), buf); assertArrayEquals(result.array(), buf.array()); @@ -367,7 +367,7 @@ public class PCEPValidatorTest { final CloseBuilder builder = new CloseBuilder().setCCloseMessage(new CCloseMessageBuilder().setCClose( new CCloseBuilder().setIgnore(false).setProcessingRule(false).setReason((short) 5).setTlvs(new TlvsBuilder().build()).build()).build()); - assertEquals(builder.build(), parser.parseMessage(result.slice(4, result.readableBytes() - 4), Collections. emptyList())); + assertEquals(builder.build(), parser.parseMessage(result.slice(4, result.readableBytes() - 4), Collections.emptyList())); final ByteBuf buf = Unpooled.buffer(result.readableBytes()); parser.serializeMessage(builder.build(), buf); assertArrayEquals(result.array(), buf.array()); @@ -395,7 +395,7 @@ public class PCEPValidatorTest { builder.setRequests(reqs1); assertEquals(new PcreqBuilder().setPcreqMessage(builder.build()).build(), parser.parseMessage(result.slice(4, - result.readableBytes() - 4), Collections. emptyList())); + result.readableBytes() - 4), Collections.emptyList())); ByteBuf buf = Unpooled.buffer(result.readableBytes()); parser.serializeMessage(new PcreqBuilder().setPcreqMessage(builder.build()).build(), buf); @@ -417,7 +417,7 @@ public class PCEPValidatorTest { this.svec).build())); assertEquals(new PcreqBuilder().setPcreqMessage(builder.build()).build(), parser.parseMessage(result.slice(4, - result.readableBytes() - 4), Collections. emptyList())); + result.readableBytes() - 4), Collections.emptyList())); buf = Unpooled.buffer(result.readableBytes()); parser.serializeMessage(new PcreqBuilder().setPcreqMessage(builder.build()).build(), buf); assertArrayEquals(result.array(), buf.array()); @@ -429,7 +429,7 @@ public class PCEPValidatorTest { assertEquals("Requests cannot be null or empty.", e.getMessage()); } try { - parser.serializeMessage(new PcreqBuilder().setPcreqMessage(new PcreqMessageBuilder().setRequests(Collections. emptyList()).build()).build(), null); + parser.serializeMessage(new PcreqBuilder().setPcreqMessage(new PcreqMessageBuilder().setRequests(Collections.emptyList()).build()).build(), null); fail(); } catch (final IllegalArgumentException e) { assertEquals("Requests cannot be null or empty.", e.getMessage()); @@ -452,7 +452,7 @@ public class PCEPValidatorTest { builder.setReplies(replies1); assertEquals(new PcrepBuilder().setPcrepMessage(builder.build()).build(), parser.parseMessage(result.slice(4, - result.readableBytes() - 4), Collections. emptyList())); + result.readableBytes() - 4), Collections.emptyList())); ByteBuf buf = Unpooled.buffer(result.readableBytes()); parser.serializeMessage(new PcrepBuilder().setPcrepMessage(builder.build()).build(), buf); assertArrayEquals(result.array(), buf.array()); @@ -470,7 +470,7 @@ public class PCEPValidatorTest { builder.setReplies(replies2); assertEquals(new PcrepBuilder().setPcrepMessage(builder.build()).build(), parser.parseMessage(result.slice(4, - result.readableBytes() - 4), Collections. emptyList())); + result.readableBytes() - 4), Collections.emptyList())); buf = Unpooled.buffer(result.readableBytes()); parser.serializeMessage(new PcrepBuilder().setPcrepMessage(builder.build()).build(), buf); assertArrayEquals(result.array(), buf.array()); @@ -486,7 +486,7 @@ public class PCEPValidatorTest { builder.setReplies(replies3); assertEquals(new PcrepBuilder().setPcrepMessage(builder.build()).build(), parser.parseMessage(result.slice(4, - result.readableBytes() - 4), Collections. emptyList())); + result.readableBytes() - 4), Collections.emptyList())); buf = Unpooled.buffer(result.readableBytes()); parser.serializeMessage(new PcrepBuilder().setPcrepMessage(builder.build()).build(), buf); assertArrayEquals(result.array(), buf.array()); @@ -509,7 +509,7 @@ public class PCEPValidatorTest { builder.setReplies(replies4); assertEquals(new PcrepBuilder().setPcrepMessage(builder.build()).build(), parser.parseMessage(result.slice(4, - result.readableBytes() - 4), Collections. emptyList())); + result.readableBytes() - 4), Collections.emptyList())); buf = Unpooled.buffer(result.readableBytes()); parser.serializeMessage(new PcrepBuilder().setPcrepMessage(builder.build()).build(), buf); assertArrayEquals(result.array(), buf.array()); @@ -521,7 +521,7 @@ public class PCEPValidatorTest { assertEquals("Replies cannot be null or empty.", e.getMessage()); } try { - parser.serializeMessage(new PcrepBuilder().setPcrepMessage(new PcrepMessageBuilder().setReplies(Collections. emptyList()).build()).build(), null); + parser.serializeMessage(new PcrepBuilder().setPcrepMessage(new PcrepMessageBuilder().setReplies(Collections.emptyList()).build()).build(), null); fail(); } catch (final IllegalArgumentException e) { assertEquals("Replies cannot be null or empty.", e.getMessage()); @@ -565,7 +565,7 @@ public class PCEPValidatorTest { builder.setNotifications(nots); assertEquals(new PcntfBuilder().setPcntfMessage(builder.build()).build(), parser.parseMessage(result.slice(4, - result.readableBytes() - 4), Collections. emptyList())); + result.readableBytes() - 4), Collections.emptyList())); final ByteBuf buf = Unpooled.buffer(result.readableBytes()); parser.serializeMessage(new PcntfBuilder().setPcntfMessage(builder.build()).build(), buf); assertArrayEquals(result.array(), buf.array()); @@ -593,7 +593,7 @@ public class PCEPValidatorTest { builder.setErrorType(new RequestCaseBuilder().setRequest(new RequestBuilder().setRps(rps).build()).build()); assertEquals(new PcerrBuilder().setPcerrMessage(builder.build()).build(), parser.parseMessage(result.slice(4, - result.readableBytes() - 4), Collections. emptyList())); + result.readableBytes() - 4), Collections.emptyList())); ByteBuf buf = Unpooled.buffer(result.readableBytes()); parser.serializeMessage(new PcerrBuilder().setPcerrMessage(builder.build()).build(), buf); assertArrayEquals(result.array(), buf.array()); @@ -609,7 +609,7 @@ public class PCEPValidatorTest { builder.setErrorType(new SessionCaseBuilder().setSession(new SessionBuilder().setOpen(this.open).build()).build()); assertEquals(new PcerrBuilder().setPcerrMessage(builder.build()).build(), parser.parseMessage(result.slice(4, - result.readableBytes() - 4), Collections. emptyList())); + result.readableBytes() - 4), Collections.emptyList())); buf = Unpooled.buffer(result.readableBytes()); parser.serializeMessage(new PcerrBuilder().setPcerrMessage(builder.build()).build(), buf); assertArrayEquals(result.array(), buf.array()); @@ -621,7 +621,7 @@ public class PCEPValidatorTest { assertEquals("Errors should not be empty.", e.getMessage()); } try { - parser.serializeMessage(new PcerrBuilder().setPcerrMessage(new PcerrMessageBuilder().setErrors(Collections. emptyList()).build()).build(), null); + parser.serializeMessage(new PcerrBuilder().setPcerrMessage(new PcerrMessageBuilder().setErrors(Collections.emptyList()).build()).build(), null); fail(); } catch (final IllegalArgumentException e) { assertEquals("Errors should not be empty.", e.getMessage()); @@ -647,7 +647,7 @@ public class PCEPValidatorTest { builder.setRequests(reqs1); assertEquals(new PcreqBuilder().setPcreqMessage(builder.build()).build(), parser.parseMessage(result.slice(4, - result.readableBytes() - 4), Collections. emptyList())); + result.readableBytes() - 4), Collections.emptyList())); final ByteBuf buf = Unpooled.buffer(result.readableBytes()); parser.serializeMessage(new PcreqBuilder().setPcreqMessage(builder.build()).build(), buf); @@ -674,7 +674,7 @@ public class PCEPValidatorTest { builder.setReplies(replies); assertEquals(new PcrepBuilder().setPcrepMessage(builder.build()).build(), parser.parseMessage(result.slice(4, - result.readableBytes() - 4), Collections. emptyList())); + result.readableBytes() - 4), Collections.emptyList())); final ByteBuf buf = Unpooled.buffer(result.readableBytes()); parser.serializeMessage(new PcrepBuilder().setPcrepMessage(builder.build()).build(), buf); assertArrayEquals(result.array(), buf.array()); @@ -697,7 +697,7 @@ public class PCEPValidatorTest { ByteBuf result = Unpooled.wrappedBuffer(msgBytes); assertEquals(new PcmonrepBuilder().setPcmonrepMessage(builder.build()).build(), parser.parseMessage(result.slice(4, - result.readableBytes() - 4), Collections. emptyList())); + result.readableBytes() - 4), Collections.emptyList())); ByteBuf buf = Unpooled.buffer(result.readableBytes()); parser.serializeMessage(new PcmonrepBuilder().setPcmonrepMessage(builder.build()).build(), buf); assertArrayEquals(result.array(), buf.array()); @@ -719,7 +719,7 @@ public class PCEPValidatorTest { result = Unpooled.wrappedBuffer(ByteArray.fileToBytes("src/test/resources/PCMonRep.bin")); assertEquals(new PcmonrepBuilder().setPcmonrepMessage(builder.build()).build(), parser.parseMessage(result.slice(4, - result.readableBytes() - 4), Collections. emptyList())); + result.readableBytes() - 4), Collections.emptyList())); buf = Unpooled.buffer(result.readableBytes()); parser.serializeMessage(new PcmonrepBuilder().setPcmonrepMessage(builder.build()).build(), buf); assertArrayEquals(result.array(), buf.array()); @@ -752,7 +752,7 @@ public class PCEPValidatorTest { builder.setReplies(replies4); assertEquals(new PcrepBuilder().setPcrepMessage(builder.build()).build(), parser.parseMessage(result.slice(4, - result.readableBytes() - 4), Collections. emptyList())); + result.readableBytes() - 4), Collections.emptyList())); final ByteBuf buf = Unpooled.buffer(result.readableBytes()); parser.serializeMessage(new PcrepBuilder().setPcrepMessage(builder.build()).build(), buf); assertArrayEquals(result.array(), buf.array()); @@ -778,7 +778,7 @@ public class PCEPValidatorTest { builder.setRequests(reqs1); assertEquals(new PcreqBuilder().setPcreqMessage(builder.build()).build(), parser.parseMessage(result.slice(4, - result.readableBytes() - 4), Collections. emptyList())); + result.readableBytes() - 4), Collections.emptyList())); final ByteBuf buf = Unpooled.buffer(result.readableBytes()); parser.serializeMessage(new PcreqBuilder().setPcreqMessage(builder.build()).build(), buf); @@ -803,7 +803,7 @@ public class PCEPValidatorTest { }; ByteBuf result = Unpooled.wrappedBuffer(msgBytes); assertEquals(new PcmonreqBuilder().setPcreqMessage(builder.build()).build(), parser.parseMessage(result.slice(4, - result.readableBytes() - 4), Collections. emptyList())); + result.readableBytes() - 4), Collections.emptyList())); ByteBuf buf = Unpooled.buffer(result.readableBytes()); parser.serializeMessage(new PcmonreqBuilder().setPcreqMessage(builder.build()).build(), buf); assertArrayEquals(result.array(), buf.array()); @@ -828,7 +828,7 @@ public class PCEPValidatorTest { builder.setMonitoringRequest(monReqBuilder.build()); assertEquals(new PcmonreqBuilder().setPcreqMessage(builder.build()).build(), parser.parseMessage(result.slice(4, - result.readableBytes() - 4), Collections. emptyList())); + result.readableBytes() - 4), Collections.emptyList())); buf = Unpooled.buffer(result.readableBytes()); parser.serializeMessage(new PcmonreqBuilder().setPcreqMessage(builder.build()).build(), buf); assertArrayEquals(result.array(), buf.array()); 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 17bf033933..62ae0f80b4 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 @@ -116,7 +116,7 @@ public final class PCCTunnelManagerImpl implements PCCTunnelManager { //check if session really has a delegation if (hasDelegation(tunnel, session)) { //send report D=0 - final Tlvs tlvs = buildTlvs(tunnel, plspId.getValue(), Optional.>absent()); + final Tlvs tlvs = buildTlvs(tunnel, plspId.getValue(), Optional.absent()); final Pcrpt pcrtp = createPcRtpMessage(new LspBuilder(update.getLsp()).setSync(true).setOperational(OperationalStatus.Up).setDelegate(false). setTlvs(tlvs).build(), Optional.of(createSrp(srpId)), tunnel.getLspState()); session.sendReport(pcrtp); @@ -148,7 +148,7 @@ public final class PCCTunnelManagerImpl implements PCCTunnelManager { tunnel.cancelTimeouts(); setDelegation(plspId, session); //send report - final Tlvs tlvs = buildTlvs(tunnel, plspId.getValue(), Optional.>absent()); + final Tlvs tlvs = buildTlvs(tunnel, plspId.getValue(), Optional.absent()); session.sendReport(createPcRtpMessage( new LspBuilder(request.getLsp()).setSync(true).setOperational(OperationalStatus.Up).setDelegate(true).setTlvs(tlvs).build(), Optional.of(createSrp(srpId)), tunnel.getLspState())); @@ -321,7 +321,7 @@ public final class PCCTunnelManagerImpl implements PCCTunnelManager { missedLsp <= this.syncOptimization.getLocalLspDbVersionValue().longValue(); missedLsp++) { final PlspId plspId = new PlspId(missedLsp); final PCCTunnel tunnel = this.tunnels.get(plspId); - createLspAndSendReport(missedLsp, tunnel, session, Optional.absent(), NO_SRP); + createLspAndSendReport(missedLsp, tunnel, session, Optional.absent(), NO_SRP); } } @@ -341,7 +341,7 @@ public final class PCCTunnelManagerImpl implements PCCTunnelManager { } private void sendEndOfSynchronization(final PCCSession session) { - sendEndOfSynchronization(session, Optional.absent()); + sendEndOfSynchronization(session, Optional.absent()); } private void sendEndOfSynchronization(final PCCSession session, final Optional operationId) { @@ -354,12 +354,12 @@ public final class PCCTunnelManagerImpl implements PCCTunnelManager { tlv = createLspTlvsEndofSync(this.syncOptimization.incrementLspDBVersion().get()); } final Pcrpt pcrtp = createPcRtpMessage(createLsp(0, false, tlv, true, false), Optional.fromNullable(srp), createPath(Collections - .emptyList())); + .emptyList())); session.sendReport(pcrtp); } private void reportAllKnownLsp(final PCCSession session) { - reportAllKnownLsp(Optional.absent(), session); + reportAllKnownLsp(Optional.absent(), session); } private void reportAllKnownLsp(final Optional operationId, final PCCSession session) { @@ -371,7 +371,7 @@ public final class PCCTunnelManagerImpl implements PCCTunnelManager { for (final Entry entry : this.tunnels.entrySet()) { final PCCTunnel tunnel = entry.getValue(); final long plspId = entry.getKey().getValue(); - createLspAndSendReport(plspId, tunnel, session, Optional.absent(), Optional.fromNullable(srp)); + createLspAndSendReport(plspId, tunnel, session, Optional.absent(), Optional.fromNullable(srp)); } } @@ -410,8 +410,8 @@ public final class PCCTunnelManagerImpl implements PCCTunnelManager { if (tunnel.getType() == LspType.PCE_LSP) { PCCTunnelManagerImpl.this.tunnels.remove(plspId); //report tunnel removal to all - sendToAll(tunnel, plspId, Collections.emptyList(), createSrp(0), new PathBuilder().build(), - createLsp(plspId.getValue(), false, Optional.absent(), false, true)); + sendToAll(tunnel, plspId, Collections.emptyList(), createSrp(0), new PathBuilder().build(), + createLsp(plspId.getValue(), false, Optional.absent(), false, true)); } } }, this.stateTimeout, TimeUnit.SECONDS); @@ -435,7 +435,7 @@ public final class PCCTunnelManagerImpl implements PCCTunnelManager { final PCCSession nextSession = PCCTunnelManagerImpl.this.sessions.get(index); if (nextSession != null) { tunnel.cancelTimeouts(); - final Tlvs tlvs = buildTlvs(tunnel, plspId.getValue(), Optional.>absent()); + final Tlvs tlvs = buildTlvs(tunnel, plspId.getValue(), Optional.absent()); nextSession.sendReport(createPcRtpMessage( createLsp(plspId.getValue(), true, Optional.fromNullable(tlvs), true, false), NO_SRP, diff --git a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/TimerHandler.java b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/TimerHandler.java index 11d79b5cd1..1c5ec5ef04 100644 --- a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/TimerHandler.java +++ b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/TimerHandler.java @@ -50,7 +50,7 @@ public class TimerHandler { @Override public void run(final Timeout timeout) throws Exception { LOG.debug("Reconnecting PCCs}"); - pcCsBuilder.createPCCs(syncOptDBVersion.isPresent() ? syncOptDBVersion.get() : BigInteger.ONE, Optional.absent()); + pcCsBuilder.createPCCs(syncOptDBVersion.isPresent() ? syncOptDBVersion.get() : BigInteger.ONE, Optional.absent()); } } diff --git a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/spi/MsgBuilderUtil.java b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/spi/MsgBuilderUtil.java index 9f018b3f81..c75f75bf35 100644 --- a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/spi/MsgBuilderUtil.java +++ b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/spi/MsgBuilderUtil.java @@ -124,7 +124,7 @@ public final class MsgBuilderUtil { public static Tlvs createLspTlvs(final long lspId, final boolean symbolicPathName, final String tunnelEndpoint, final String tunnelSender, final String extendedTunnelAddress, final Optional symbolicName) { - return createLspTlvs(lspId, symbolicPathName, tunnelEndpoint, tunnelSender, extendedTunnelAddress, symbolicName, Optional.absent()); + return createLspTlvs(lspId, symbolicPathName, tunnelEndpoint, tunnelSender, extendedTunnelAddress, symbolicName, Optional.absent()); } public static Tlvs createLspTlvs(final long lspId, final boolean symbolicPathName, final String tunnelEndpoint, diff --git a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCSessionListenerTest.java b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCSessionListenerTest.java index 96244f33af..90ce8817e3 100644 --- a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCSessionListenerTest.java +++ b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCSessionListenerTest.java @@ -126,7 +126,7 @@ public class PCCSessionListenerTest { final PCCSessionListener listener = new PCCSessionListener(1, tunnelManager, false); listener.onSessionUp(mockedSession); listener.sendError(MsgBuilderUtil.createErrorMsg(PCEPErrors.ATTEMPT_2ND_SESSION, 0)); - Mockito.verify(mockedSession).sendMessage(Mockito.any()); + Mockito.verify(mockedSession).sendMessage(Mockito.any()); } @Test @@ -134,7 +134,7 @@ public class PCCSessionListenerTest { final PCCSessionListener listener = new PCCSessionListener(1, tunnelManager, false); listener.onSessionUp(mockedSession); listener.sendReport(null); - Mockito.verify(mockedSession).sendMessage(Mockito.any()); + Mockito.verify(mockedSession).sendMessage(Mockito.any()); } @Test diff --git a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCSyncAvoidanceProcedureTest.java b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCSyncAvoidanceProcedureTest.java index 18bb21ebd4..c80dd5c97c 100644 --- a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCSyncAvoidanceProcedureTest.java +++ b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCSyncAvoidanceProcedureTest.java @@ -34,7 +34,7 @@ public class PCCSyncAvoidanceProcedureTest extends PCCMockCommon { final TestingSessionListener pceSessionListener = getListener(factory); assertNotNull(pceSessionListener); assertNotNull(pceSessionListener.getSession()); - checkResyncSession(Optional.absent(), 11, null, BigInteger.valueOf(10), pceSessionListener); + checkResyncSession(Optional.absent(), 11, null, BigInteger.valueOf(10), pceSessionListener); channel.close().get(); } diff --git a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTunnelManagerImplTest.java b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTunnelManagerImplTest.java index a1b462031c..dac29864de 100644 --- a/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTunnelManagerImplTest.java +++ b/pcep/pcc-mock/src/test/java/org/opendaylight/protocol/pcep/pcc/mock/PCCTunnelManagerImplTest.java @@ -304,7 +304,7 @@ public class PCCTunnelManagerImplTest { } private Updates createUpdate(final long plspId) { - return createUpdate(plspId, Optional.absent()); + return createUpdate(plspId, Optional.absent()); } private static Updates createUpdate(final long plspId, final Optional delegate) { @@ -340,15 +340,15 @@ public class PCCTunnelManagerImplTest { } private static Requests createRequestsRemove(final long plspId) { - return createRequests(plspId, Optional.of(true), Optional.absent()); + return createRequests(plspId, Optional.of(true), Optional.absent()); } private static Requests createRequestsDelegate(final long plspId) { - return createRequests(plspId, Optional.absent(), Optional.of(true)); + return createRequests(plspId, Optional.absent(), Optional.of(true)); } private static Requests createRequests(final long plspId) { - return createRequests(plspId, Optional.absent(), Optional.absent()); + return createRequests(plspId, Optional.absent(), Optional.absent()); } private static PCEPErrors getError(final Pcerr errorMessage) { diff --git a/pcep/spi/src/test/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParserTest.java b/pcep/spi/src/test/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParserTest.java index 0bc3dfa12e..655900e166 100644 --- a/pcep/spi/src/test/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParserTest.java +++ b/pcep/spi/src/test/java/org/opendaylight/protocol/pcep/spi/AbstractMessageParserTest.java @@ -66,7 +66,7 @@ public class AbstractMessageParserTest { } else if (objects.get(0) instanceof ErrorObject) { final short errorType = ((ErrorObject) objects.get(0)).getType(); final short errorValue = ((ErrorObject) objects.get(0)).getValue(); - return createErrorMsg(PCEPErrors.forValue(errorType, errorValue), Optional.absent()); + return createErrorMsg(PCEPErrors.forValue(errorType, errorValue), Optional.absent()); } return null; } @@ -91,7 +91,7 @@ public class AbstractMessageParserTest { Mockito.verify(this.registry, Mockito.only()).serializeObject(Mockito.any(Object.class), Mockito.any(ByteBuf.class)); - final Message b = a.parseMessage(Unpooled.wrappedBuffer(new byte[] {0x0D, 0x13, 0, 0x08, 0, 0, 1, 1 }), Collections. emptyList()); + final Message b = a.parseMessage(Unpooled.wrappedBuffer(new byte[] {0x0D, 0x13, 0, 0x08, 0, 0, 1, 1 }), Collections.emptyList()); assertEquals(this.object, ((Pcerr) b).getPcerrMessage().getErrors().get(0).getErrorObject()); } @@ -104,7 +104,7 @@ public class AbstractMessageParserTest { parser.serializeVendorInformationObjects(Lists.newArrayList(this.viObject), buffer); Mockito.verify(this.registry, Mockito.only()).serializeVendorInformationObject(Mockito.any(VendorInformationObject.class), Mockito.any(ByteBuf.class)); - final Message msg = parser.parseMessage(Unpooled.wrappedBuffer(new byte[] {0x22, 0x13, 0x00, 0x08, 0, 0, 0, 0 }), Collections. emptyList()); + final Message msg = parser.parseMessage(Unpooled.wrappedBuffer(new byte[] {0x22, 0x13, 0x00, 0x08, 0, 0, 0, 0 }), Collections.emptyList()); assertEquals(this.viObject, ((Pcrep)msg).getPcrepMessage().getReplies().get(0).getVendorInformationObject().get(0)); } diff --git a/pcep/spi/src/test/java/org/opendaylight/protocol/pcep/spi/RegistryTest.java b/pcep/spi/src/test/java/org/opendaylight/protocol/pcep/spi/RegistryTest.java index 253b22c69e..2e7951f4c5 100644 --- a/pcep/spi/src/test/java/org/opendaylight/protocol/pcep/spi/RegistryTest.java +++ b/pcep/spi/src/test/java/org/opendaylight/protocol/pcep/spi/RegistryTest.java @@ -183,7 +183,7 @@ public class RegistryTest { this.ctx.getObjectHandlerRegistry().parseObject(4, 1, new ObjectHeaderImpl(true, false), buffer); this.ctx.getObjectHandlerRegistry().serializeObject(new OpenBuilder().build(), buffer); - this.ctx.getMessageHandlerRegistry().parseMessage(6, buffer, Collections. emptyList()); + this.ctx.getMessageHandlerRegistry().parseMessage(6, buffer, Collections.emptyList()); this.ctx.getMessageHandlerRegistry().serializeMessage(new KeepaliveBuilder().build(), buffer); this.ctx.getVendorInformationObjectRegistry().parseVendorInformationObject(new EnterpriseNumber(10L), new ObjectHeaderImpl(true, false), buffer); diff --git a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/OperationResults.java b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/OperationResults.java index fc424dfddc..f12997cee9 100644 --- a/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/OperationResults.java +++ b/pcep/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/OperationResults.java @@ -52,16 +52,16 @@ final class OperationResults implements OperationResult { } ListenableFuture future() { - return Futures. immediateFuture(this); + return Futures.immediateFuture(this); } public static OperationResults createFailed(final List errors) { - final List e = errors != null ? errors : Collections.emptyList(); + final List e = errors != null ? errors : Collections.emptyList(); return new OperationResults(FailureType.Failed, Lists.transform(e, CONVERT_ERRORS)); } public static OperationResults createUnsent(final PCEPErrors error) { - final List e = error != null ? Collections.singletonList(getErrorFor(error)) : Collections.emptyList(); + final List e = error != null ? Collections.singletonList(getErrorFor(error)) : Collections.emptyList(); return new OperationResults(FailureType.Unsent, Lists.transform(e, CONVERT_ERRORS)); } 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 2dd33d1712..7d34cdf3e8 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 @@ -115,7 +115,7 @@ class Stateful07TopologySessionListener extends AbstractTopologySessionListener< final Stateful stateful = tlvs.getAugmentation(Tlvs1.class).getStateful(); if (stateful != null) { getSessionListenerState().setPeerCapabilities(getCapabilities(stateful)); - pccBuilder.setReportedLsp(Collections. emptyList()); + pccBuilder.setReportedLsp(Collections.emptyList()); if (isSynchronized()) { pccBuilder.setStateSync(PccSyncState.Synchronized); } else if (isTriggeredInitialSynchro()) { diff --git a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractPCEPSessionTest.java b/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractPCEPSessionTest.java index 7f9fb8f077..4c755fff6a 100644 --- a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractPCEPSessionTest.java +++ b/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractPCEPSessionTest.java @@ -118,7 +118,7 @@ public abstract class AbstractPCEPSessionTest>>any()); + doReturn(null).when(this.channelFuture).addListener(Mockito.any()); doReturn("TestingChannel").when(this.clientListener).toString(); doReturn(this.pipeline).when(this.clientListener).pipeline(); doReturn(this.pipeline).when(this.pipeline).replace(any(ChannelHandler.class), any(String.class), any(ChannelHandler.class)); diff --git a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/IncrementalSynchronizationProcedureTest.java b/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/IncrementalSynchronizationProcedureTest.java index e8e8ba3206..505acdb71f 100644 --- a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/IncrementalSynchronizationProcedureTest.java +++ b/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/IncrementalSynchronizationProcedureTest.java @@ -131,7 +131,7 @@ public class IncrementalSynchronizationProcedureTest extends AbstractPCEPSession .setSymbolicPathName(new SymbolicPathNameBuilder().setPathName(new SymbolicPathName(pathname.getBytes())).build()) .addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs1.class, new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync .optimizations.rev150714.Tlvs1Builder().setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(val)).build()).build()).build()).setPlspId(new PlspId(val) - ).setSync(true).setRemove(false).setOperational(OperationalStatus.Active).build(), Optional.absent(), createPath(Collections.emptyList())); + ).setSync(true).setRemove(false).setOperational(OperationalStatus.Active).build(), Optional.absent(), createPath(Collections.emptyList())); } private Pcrpt getSyncPcrt() { @@ -139,6 +139,6 @@ public class IncrementalSynchronizationProcedureTest extends AbstractPCEPSession new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.lsp.object.lsp.TlvsBuilder().addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs1.class, new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync .optimizations.rev150714.Tlvs1Builder().setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(3L)).build()).build()).build()), true, false), Optional.absent(), - createPath(Collections.emptyList())); + createPath(Collections.emptyList())); } } diff --git a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTriggeredReSynchronizationProcedureTest.java b/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTriggeredReSynchronizationProcedureTest.java index 7a0f6bdf01..c40d740f70 100644 --- a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTriggeredReSynchronizationProcedureTest.java +++ b/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCEPTriggeredReSynchronizationProcedureTest.java @@ -172,7 +172,7 @@ public class PCEPTriggeredReSynchronizationProcedureTest extends AbstractPCEPSes org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs1.class, new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs1Builder() .setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(3L)).build()).build()).build()), true, false), - Optional.of(srpBuilder.build()), createPath(Collections.emptyList())); + Optional.of(srpBuilder.build()), createPath(Collections.emptyList())); } private Pcrpt getPcrt() { @@ -183,7 +183,7 @@ public class PCEPTriggeredReSynchronizationProcedureTest extends AbstractPCEPSes .addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs1.class, new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs1Builder() .setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(1L)).build()).build()).build()) - .setPlspId(new PlspId(1L)).setSync(true).setRemove(false).setOperational(OperationalStatus.Active).build(), Optional.absent(), - createPath(Collections.emptyList())); + .setPlspId(new PlspId(1L)).setSync(true).setRemove(false).setOperational(OperationalStatus.Active).build(), Optional.absent(), + createPath(Collections.emptyList())); } } diff --git a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCETriggeredInitialSyncProcedureTest.java b/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCETriggeredInitialSyncProcedureTest.java index a109c9de44..cd7aaa6787 100644 --- a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCETriggeredInitialSyncProcedureTest.java +++ b/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/PCETriggeredInitialSyncProcedureTest.java @@ -107,8 +107,8 @@ public class PCETriggeredInitialSyncProcedureTest extends AbstractPCEPSessionTes .xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs1.class, new org.opendaylight .yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714 .Tlvs1Builder().setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(BigInteger - .valueOf(2L)).build()).build()).build()), true, false), Optional.absent(), - createPath(Collections.emptyList())); + .valueOf(2L)).build()).build()).build()), true, false), Optional.absent(), + createPath(Collections.emptyList())); } private Pcrpt getPcrpt() { @@ -121,6 +121,6 @@ public class PCETriggeredInitialSyncProcedureTest extends AbstractPCEPSessionTes .urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs1Builder() .setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(3L)).build()) .build()).build()).setPlspId(new PlspId(1L)).setSync(true).setRemove(false).setOperational - (OperationalStatus.Active).build(), Optional.absent(), createPath(Collections.emptyList())); + (OperationalStatus.Active).build(), Optional.absent(), createPath(Collections.emptyList())); } } diff --git a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/StateSynchronizationAvoidanceProcedureTest.java b/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/StateSynchronizationAvoidanceProcedureTest.java index 409160af14..767994f01a 100644 --- a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/StateSynchronizationAvoidanceProcedureTest.java +++ b/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/StateSynchronizationAvoidanceProcedureTest.java @@ -101,7 +101,7 @@ public class StateSynchronizationAvoidanceProcedureTest extends AbstractPCEPSess final Pcrpt pcRpt = MsgBuilderUtil.createPcRtpMessage(new LspBuilder().setPlspId(new PlspId(1L)).setTlvs( new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.lsp.object.lsp.TlvsBuilder().setLspIdentifiers(new LspIdentifiersBuilder().setLspId(new LspId(1L)).build()).setSymbolicPathName(new SymbolicPathNameBuilder().setPathName(new SymbolicPathName("test".getBytes())).build()) .addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs1.class, - new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs1Builder().setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(1L)).build()).build()).build()).setPlspId(new PlspId(1L)).setSync(true).setRemove(false).setOperational(OperationalStatus.Active).build(), Optional.absent(), createPath(Collections. emptyList())); + new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs1Builder().setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(1L)).build()).build()).build()).setPlspId(new PlspId(1L)).setSync(true).setRemove(false).setOperational(OperationalStatus.Active).build(), Optional.absent(), createPath(Collections.emptyList())); this.listener.onMessage(session, pcRpt); final Topology topo = getTopology().get(); final PathComputationClient pcc = topo.getNode().get(0).getAugmentation(Node1.class).getPathComputationClient(); @@ -122,9 +122,9 @@ public class StateSynchronizationAvoidanceProcedureTest extends AbstractPCEPSess Assert.assertFalse(pcc2.getReportedLsp().isEmpty()); //sync rpt + LSP-DB final Pcrpt syncMsg = MsgBuilderUtil.createPcRtpMessage(createLsp(0, false, Optional.of( - new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.lsp.object.lsp.TlvsBuilder().addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs1.class, - new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs1Builder().setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(2L)).build()).build()).build()), true, false), Optional.absent(), - createPath(Collections. emptyList())); + new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.ietf.stateful.rev131222.lsp.object.lsp.TlvsBuilder().addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs1.class, + new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.pcep.sync.optimizations.rev150714.Tlvs1Builder().setLspDbVersion(new LspDbVersionBuilder().setLspDbVersionValue(BigInteger.valueOf(2L)).build()).build()).build()), true, false), Optional.absent(), + createPath(Collections.emptyList())); this.listener.onMessage(session, syncMsg); final Topology topo3 = getTopology().get(); final PathComputationClient pcc3 = topo3.getNode().get(0).getAugmentation(Node1.class).getPathComputationClient(); diff --git a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListenerTest.java b/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListenerTest.java index ff70d2d139..0608b217d1 100755 --- a/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListenerTest.java +++ b/pcep/topology-provider/src/test/java/org/opendaylight/bgpcep/pcep/topology/provider/Stateful07TopologySessionListenerTest.java @@ -136,7 +136,7 @@ public class Stateful07TopologySessionListenerTest extends AbstractPCEPSessionTe final Requests req = pcinitiate.getPcinitiateMessage().getRequests().get(0); final long srpId = req.getSrp().getOperationId().getValue(); final Tlvs tlvs = createLspTlvs(req.getLsp().getPlspId().getValue(), true, - testAddress, testAddress, testAddress, Optional.absent()); + testAddress, testAddress, testAddress, Optional.absent()); final Pcrpt pcRpt = MsgBuilderUtil.createPcRtpMessage(new LspBuilder(req.getLsp()).setTlvs(tlvs).setPlspId(new PlspId(1L)).setSync(false).setRemove(false).setOperational(OperationalStatus.Active).build(), Optional.of(MsgBuilderUtil.createSrp(srpId)), MsgBuilderUtil.createPath(req.getEro().getSubobject())); final Pcrpt esm = MsgBuilderUtil.createPcRtpMessage(new LspBuilder().setSync(false).build(), Optional.of(MsgBuilderUtil.createSrp(0L)), null); this.listener.onMessage(this.session, esm); @@ -183,7 +183,7 @@ public class Stateful07TopologySessionListenerTest extends AbstractPCEPSessionTe final Updates upd = updateMsg.getPcupdMessage().getUpdates().get(0); final long srpId2 = upd.getSrp().getOperationId().getValue(); final Tlvs tlvs2 = createLspTlvs(upd.getLsp().getPlspId().getValue(), false, - newDestinationAddress, testAddress, testAddress, Optional.absent()); + newDestinationAddress, testAddress, testAddress, Optional.absent()); final Pcrpt pcRpt2 = MsgBuilderUtil.createPcRtpMessage(new LspBuilder(upd.getLsp()).setTlvs(tlvs2).setSync(true).setRemove(false).setOperational(OperationalStatus.Active).build(), Optional.of(MsgBuilderUtil.createSrp(srpId2)), MsgBuilderUtil.createPath(upd.getPath().getEro().getSubobject())); this.listener.onMessage(this.session, pcRpt2); //check updated lsp @@ -226,8 +226,8 @@ public class Stateful07TopologySessionListenerTest extends AbstractPCEPSessionTe final Requests req2 = pcinitiate2.getPcinitiateMessage().getRequests().get(0); final long srpId3 = req2.getSrp().getOperationId().getValue(); final Tlvs tlvs3 = createLspTlvs(req2.getLsp().getPlspId().getValue(), false, - testAddress, testAddress, testAddress, Optional.absent()); - final Pcrpt pcRpt3 = MsgBuilderUtil.createPcRtpMessage(new LspBuilder(req2.getLsp()).setTlvs(tlvs3).setRemove(true).setSync(true).setOperational(OperationalStatus.Down).build(), Optional.of(MsgBuilderUtil.createSrp(srpId3)), MsgBuilderUtil.createPath(Collections.emptyList())); + testAddress, testAddress, testAddress, Optional.absent()); + final Pcrpt pcRpt3 = MsgBuilderUtil.createPcRtpMessage(new LspBuilder(req2.getLsp()).setTlvs(tlvs3).setRemove(true).setSync(true).setOperational(OperationalStatus.Down).build(), Optional.of(MsgBuilderUtil.createSrp(srpId3)), MsgBuilderUtil.createPath(Collections.emptyList())); this.listener.onMessage(this.session, pcRpt3); // check if lsp was removed topology = getTopology().get(); @@ -252,7 +252,7 @@ public class Stateful07TopologySessionListenerTest extends AbstractPCEPSessionTe @Test public void testOnUnhandledErrorMessage() { - final Message errorMsg = AbstractMessageParser.createErrorMsg(PCEPErrors.NON_ZERO_PLSPID, Optional.absent()); + final Message errorMsg = AbstractMessageParser.createErrorMsg(PCEPErrors.NON_ZERO_PLSPID, Optional.absent()); this.listener.onSessionUp(this.session); assertTrue(this.listener.onMessage(Optional.absent().orNull(), errorMsg)); } @@ -293,7 +293,7 @@ public class Stateful07TopologySessionListenerTest extends AbstractPCEPSessionTe final Requests req = pcinitiate.getPcinitiateMessage().getRequests().get(0); final long srpId = req.getSrp().getOperationId().getValue(); final Tlvs tlvs = createLspTlvs(req.getLsp().getPlspId().getValue(), true, - testAddress, testAddress, testAddress, Optional.absent()); + testAddress, testAddress, testAddress, Optional.absent()); final Pcrpt pcRpt = MsgBuilderUtil.createPcRtpMessage(new LspBuilder(req.getLsp()).setTlvs(tlvs).setSync(true).setRemove(false).setOperational(OperationalStatus.Active).build(), Optional.of(MsgBuilderUtil.createSrp(srpId)), MsgBuilderUtil.createPath(req.getEro().getSubobject())); this.listener.onMessage(this.session, pcRpt); assertEquals(1, getTopology().get().getNode().size()); @@ -353,7 +353,7 @@ public class Stateful07TopologySessionListenerTest extends AbstractPCEPSessionTe final Requests req = pcinitiate.getPcinitiateMessage().getRequests().get(0); final long srpId = req.getSrp().getOperationId().getValue(); final Tlvs tlvs = createLspTlvs(req.getLsp().getPlspId().getValue(), true, - testAddress, testAddress, testAddress, Optional.absent()); + testAddress, testAddress, testAddress, Optional.absent()); final Pcrpt pcRpt = MsgBuilderUtil.createPcRtpMessage(new LspBuilder(req.getLsp()).setTlvs(tlvs).setPlspId(new PlspId(1L)).setSync(false).setRemove(false).setOperational(OperationalStatus.Active).build(), Optional.of(MsgBuilderUtil.createSrp(srpId)), MsgBuilderUtil.createPath(req.getEro().getSubobject())); this.listener.onMessage(this.session, pcRpt); diff --git a/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/CreateTunnelInstructionExecutor.java b/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/CreateTunnelInstructionExecutor.java index d25301fc9a..5ba578d2e0 100644 --- a/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/CreateTunnelInstructionExecutor.java +++ b/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/CreateTunnelInstructionExecutor.java @@ -201,7 +201,7 @@ final class CreateTunnelInstructionExecutor extends AbstractInstructionExecutor if (sc.getIpv4Address() != null) { for (final IpAddress dc : dsts) { if (dc.getIpv4Address() != null) { - return Optional.of(new Ipv4CaseBuilder().setIpv4(new Ipv4Builder().setSourceIpv4Address(sc.getIpv4Address()). + return Optional.of(new Ipv4CaseBuilder().setIpv4(new Ipv4Builder().setSourceIpv4Address(sc.getIpv4Address()). setDestinationIpv4Address(dc.getIpv4Address()).build()).build()); } } @@ -216,7 +216,7 @@ final class CreateTunnelInstructionExecutor extends AbstractInstructionExecutor if (sc.getIpv6Address() != null) { for (final IpAddress dc : dsts) { if (dc.getIpv6Address() != null) { - return Optional.of(new Ipv6CaseBuilder().setIpv6(new Ipv6Builder().setSourceIpv6Address(sc.getIpv6Address()). + return Optional.of(new Ipv6CaseBuilder().setIpv6(new Ipv6Builder().setSourceIpv6Address(sc.getIpv6Address()). setDestinationIpv6Address(dc.getIpv6Address()).build()).build()); } } diff --git a/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunelProgrammingUtil.java b/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunelProgrammingUtil.java index bef4b709ef..b9acd8ad1f 100644 --- a/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunelProgrammingUtil.java +++ b/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunelProgrammingUtil.java @@ -38,7 +38,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; final class TunelProgrammingUtil { - public static final ListenableFuture RESULT = Futures.immediateFuture(new OperationResult() { + public static final ListenableFuture RESULT = Futures.immediateFuture(new OperationResult() { @Override public Class getImplementedInterface() { return OperationResult.class; diff --git a/pcep/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/NodeChangedListenerTest.java b/pcep/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/NodeChangedListenerTest.java index 6611261790..eb1ec2095f 100644 --- a/pcep/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/NodeChangedListenerTest.java +++ b/pcep/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/NodeChangedListenerTest.java @@ -82,7 +82,7 @@ public class NodeChangedListenerTest extends AbstractDataBrokerTest { @Before public void setUp() throws TransactionCommitFailedException { final WriteTransaction wTx = getDataBroker().newWriteOnlyTransaction(); - wTx.put(LogicalDatastoreType.OPERATIONAL, PCEP_TOPO_IID, new TopologyBuilder().setKey(new TopologyKey(PCEP_TOPOLOGY_ID)).setNode(Lists.newArrayList()).setTopologyId(PCEP_TOPOLOGY_ID).build(), true); + wTx.put(LogicalDatastoreType.OPERATIONAL, PCEP_TOPO_IID, new TopologyBuilder().setKey(new TopologyKey(PCEP_TOPOLOGY_ID)).setNode(Lists.newArrayList()).setTopologyId(PCEP_TOPOLOGY_ID).build(), true); wTx.put(LogicalDatastoreType.OPERATIONAL, TUNNEL_TOPO_IID, new TopologyBuilder().setKey(new TopologyKey(TUNNEL_TOPOLOGY_ID)).setTopologyId(TUNNEL_TOPOLOGY_ID).build(), true); wTx.submit().checkedGet(); final NodeChangedListener nodeListener = new NodeChangedListener(getDataBroker(), PCEP_TOPOLOGY_ID, TUNNEL_TOPO_IID); diff --git a/pcep/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgrammingTest.java b/pcep/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgrammingTest.java index 26b4b77daa..59b49a0112 100644 --- a/pcep/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgrammingTest.java +++ b/pcep/tunnel-provider/src/test/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgrammingTest.java @@ -216,7 +216,7 @@ public class TunnelProgrammingTest extends AbstractDataBrokerTest { createInputBuilder.setBandwidth(bwd); createInputBuilder.setClassType(classType); createInputBuilder.setSymbolicPathName(tunnelName); - createInputBuilder.setExplicitHops(Lists.newArrayList()); + createInputBuilder.setExplicitHops(Lists.newArrayList()); createInputBuilder.addAugmentation(PcepCreateP2pTunnelInput1.class, new PcepCreateP2pTunnelInput1Builder().setAdministrativeStatus(AdministrativeStatus.Active).build()); this.tunnelProgramming.pcepCreateP2pTunnel(createInputBuilder.build()); //check add-lsp input 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 079086d09e..72f789eec1 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 @@ -121,7 +121,7 @@ public final class ProgrammingServiceImpl implements AutoCloseable, InstructionS final WriteTransaction t = dataProvider.newWriteOnlyTransaction(); t.put(LogicalDatastoreType.OPERATIONAL, this.qid, new InstructionsQueueBuilder().setKey(instructionsQueueKey).setInstruction( - Collections. emptyList()).build()); + Collections.emptyList()).build()); t.submit(); } diff --git a/programming/impl/src/test/java/org/opendaylight/bgpcep/programming/impl/ProgrammingServiceImplTest.java b/programming/impl/src/test/java/org/opendaylight/bgpcep/programming/impl/ProgrammingServiceImplTest.java index b36add12c8..38185069f3 100644 --- a/programming/impl/src/test/java/org/opendaylight/bgpcep/programming/impl/ProgrammingServiceImplTest.java +++ b/programming/impl/src/test/java/org/opendaylight/bgpcep/programming/impl/ProgrammingServiceImplTest.java @@ -307,7 +307,7 @@ public class ProgrammingServiceImplTest extends AbstractDataBrokerTest { } private SubmitInstructionInput getMockedSubmitInstructionInput(final String id, final String... dependencyIds) { - return getMockedSubmitInstructionInput(id, Optional. absent(), dependencyIds); + return getMockedSubmitInstructionInput(id, Optional.absent(), dependencyIds); } private SubmitInstructionInput getMockedSubmitInstructionInput(final String id, final Optional deadline, final String... dependencyIds) {