Eliminate some leftovers from codegen change.
Change-Id: I3bc180b1f965f9a5854e2d8b6454ed315cca72c8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
keys.add(routeKey);
}
return keys;
- } else {
- LOG.warn("Routes {} are not a map", routes);
}
+ LOG.warn("Routes {} are not a map", routes);
}
}
return Collections.emptyList();
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
*/
final class IPv4RIBSupport extends AbstractIPRibSupport<Ipv4RoutesCase, Ipv4Routes, Ipv4Route, Ipv4RouteKey> {
- private static final Ipv4Routes EMPTY_CONTAINER
- = new Ipv4RoutesBuilder().setIpv4Route(Collections.emptyList()).build();
+ private static final Ipv4Routes EMPTY_CONTAINER = new Ipv4RoutesBuilder().build();
private static IPv4RIBSupport SINGLETON = null;
private IPv4RIBSupport(final BindingNormalizedNodeSerializer mappingService) {
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
*/
final class IPv6RIBSupport extends AbstractIPRibSupport<Ipv6RoutesCase, Ipv6Routes, Ipv6Route, Ipv6RouteKey> {
- private static final Ipv6Routes EMPTY_CONTAINER
- = new Ipv6RoutesBuilder().setIpv6Route(Collections.emptyList()).build();
+ private static final Ipv6Routes EMPTY_CONTAINER = new Ipv6RoutesBuilder().build();
private static IPv6RIBSupport SINGLETON;
private IPv6RIBSupport(final BindingNormalizedNodeSerializer mappingService) {
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.protocol.bgp.inet;
import static org.junit.Assert.assertEquals;
import com.google.common.collect.Lists;
import java.util.Collection;
import java.util.Collections;
+import java.util.Map;
import org.junit.Assert;
import org.junit.Test;
import org.opendaylight.protocol.bgp.rib.spi.AbstractRIBSupportTest;
.setAttributes(ATTRIBUTES)
.setPathId(PATH_ID)
.setPrefix(PREFIX).build();
- private static final Ipv6Routes ROUTES = new Ipv6RoutesBuilder()
- .setIpv6Route(Collections.singletonList(ROUTE)).build();
- private static final Ipv6Routes EMPTY_ROUTES = new Ipv6RoutesBuilder().build();
+ private static final Ipv6Routes ROUTES = new Ipv6RoutesBuilder().setIpv6Route(Map.of(ROUTE.key(), ROUTE)).build();
@Override
public void setUp() throws Exception {
paBuilder.setClusterId(new ClusterIdBuilder().setCluster(clusters).build());
assertEquals(paBuilder.getClusterId(), attrs.getClusterId());
- final MpReachNlriBuilder mpBuilder = new MpReachNlriBuilder();
- mpBuilder.setAfi(Ipv6AddressFamily.class);
- mpBuilder.setSafi(UnicastSubsequentAddressFamily.class);
- mpBuilder.setCNextHop(nextHop);
- mpBuilder.setAdvertizedRoutes(new AdvertizedRoutesBuilder().setDestinationType(
- new DestinationIpv6CaseBuilder().setDestinationIpv6(new DestinationIpv6Builder()
- .setIpv6Prefixes(prefs).build()).build()).build());
-
- paBuilder.addAugmentation(Attributes1.class, new Attributes1Builder()
- .setMpReachNlri(mpBuilder.build()).build());
+ final MpReachNlriBuilder mpBuilder = new MpReachNlriBuilder()
+ .setAfi(Ipv6AddressFamily.class)
+ .setSafi(UnicastSubsequentAddressFamily.class)
+ .setCNextHop(nextHop)
+ .setAdvertizedRoutes(new AdvertizedRoutesBuilder()
+ .setDestinationType(new DestinationIpv6CaseBuilder()
+ .setDestinationIpv6(new DestinationIpv6Builder().setIpv6Prefixes(prefs).build())
+ .build())
+ .build());
+
+ paBuilder.addAugmentation(new Attributes1Builder().setMpReachNlri(mpBuilder.build()).build());
assertEquals(paBuilder.augmentation(Attributes1.class).getMpReachNlri(),
attrs.augmentation(Attributes1.class).getMpReachNlri());
- paBuilder.setUnrecognizedAttributes(Collections.emptyList());
+ paBuilder.setUnrecognizedAttributes(Collections.emptyMap());
// check API message
builder.setAttributes(paBuilder.build());
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.PathId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.path.attributes.Attributes;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.path.attributes.AttributesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.Attributes1;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.Attributes1Builder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.Attributes2;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.Attributes2Builder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.update.attributes.MpReachNlri;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.update.attributes.MpReachNlriBuilder;
final Ipv4NlriParser serializer = new Ipv4NlriParser();
final ByteBuf output = Unpooled.buffer(MP_NLRI_BYTES.length);
- final Attributes attributes = new AttributesBuilder().addAugmentation(Attributes1.class,
- new Attributes1Builder().setMpReachNlri(mpReachNlri).build()).build();
+ final Attributes attributes = new AttributesBuilder()
+ .addAugmentation(new Attributes1Builder().setMpReachNlri(mpReachNlri).build())
+ .build();
serializer.serializeAttribute(attributes, output);
Assert.assertArrayEquals(MP_NLRI_BYTES, output.array());
}
final Ipv4NlriParser serializer = new Ipv4NlriParser();
final ByteBuf output = Unpooled.buffer(MP_NLRI_BYTES.length);
- final Attributes attributes = new AttributesBuilder().addAugmentation(Attributes2.class,
- new Attributes2Builder().setMpUnreachNlri(mpUnreachNlri).build()).build();
+ final Attributes attributes = new AttributesBuilder()
+ .addAugmentation(new Attributes2Builder().setMpUnreachNlri(mpUnreachNlri).build())
+ .build();
serializer.serializeAttribute(attributes, output);
Assert.assertArrayEquals(MP_NLRI_BYTES, output.array());
}