From 310f15691a6235382a40320faaca6e5a6e3a4484 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 4 Apr 2019 22:33:32 +0200 Subject: [PATCH] Bump MDSAL to 4.0.0 This bumps MD-SAL references to 4.0.0 and fixes up for API incompatibilities. Change-Id: I978a1d8cf05a744115888a4b6a983e517b72dda1 Signed-off-by: Robert Varga --- .../protocol/bgp/benchmark/app/AppPeerBenchmark.java | 2 +- .../OSGI-INF/blueprint/bgp-app-peer-benchmark.xml | 4 ++-- .../bgp/evpn/spi/pojo/SimpleEsiTypeRegistry.java | 2 +- .../bgp/evpn/spi/pojo/SimpleEvpnNlriRegistry.java | 2 +- .../bgp/evpn/spi/pojo/SimpleEsiTypeRegistryTest.java | 5 ++--- .../evpn/spi/pojo/SimpleEvpnNlriRegistryTest.java | 5 ++--- .../bgp/flowspec/SimpleFlowspecTypeRegistry.java | 2 +- .../protocol/bgp/inet/AbstractIPRibSupport.java | 5 +++-- .../l3vpn/mcast/AbstractL3vpnMcastIpRIBSupport.java | 5 +++-- .../impl/attribute/sr/SrLinkAttributesParser.java | 3 +-- .../impl/tlvs/AbstractNodeDescriptorTlvCodec.java | 3 +-- .../bgp/linkstate/impl/tlvs/LinkIdTlvParser.java | 5 ++--- .../spi/pojo/SimpleBindingSubTlvsRegistry.java | 2 +- .../linkstate/spi/pojo/SimpleNlriTypeRegistry.java | 4 ++-- .../bgp/mvpn/impl/AbstractMvpnRIBSupport.java | 5 +++-- .../identifier/SimpleTunnelIdentifierRegistry.java | 2 +- .../mvpn/spi/pojo/nlri/SimpleMvpnNlriRegistry.java | 2 +- .../identifier/PAddressPMulticastGroupUtilTest.java | 7 +++---- .../spi/pojo/nlri/SimpleMvpnNlriRegistryTest.java | 5 ++--- .../impl/RouteTargetConstrainRIBSupport.java | 7 ++++--- .../nlri/SimpleRouteTargetConstrainNlriRegistry.java | 2 +- .../protocol/bgp/parser/BgpTableTypeImpl.java | 2 +- .../impl/message/open/CapabilityParameterParser.java | 2 +- .../spi/pojo/SimpleBgpPrefixSidTlvRegistry.java | 2 +- .../spi/pojo/SimpleExtendedCommunityRegistry.java | 2 +- .../bgp/parser/spi/pojo/SimpleMessageRegistry.java | 2 +- .../bgp/parser/spi/pojo/SimpleNlriRegistry.java | 2 +- .../bgp/parser/spi/pojo/SimpleParameterRegistry.java | 2 +- .../bgp/parser/spi/pojo/SimpleRegistryTest.java | 6 +++--- .../protocol/bgp/rib/impl/CodecsImpl.java | 11 ++++++----- .../protocol/bgp/rib/spi/RIBSupport.java | 5 +++-- .../protocol/bgp/rib/spi/AbstractRIBSupportTest.java | 2 +- .../AbstractReachabilityTopologyBuilder.java | 2 +- .../topology/provider/LinkstateTopologyBuilder.java | 4 ++-- .../bgpcep/bgp/topology/provider/ProtocolUtil.java | 8 +++++--- .../bgpcep/bgp/topology/provider/UriBuilder.java | 2 +- binding-parent/pom.xml | 2 +- .../protocol/bmp/impl/app/BmpRouterPeerImpl.java | 6 +++--- .../protocol/bmp/impl/app/TableContext.java | 5 +++-- .../bmp/spi/registry/SimpleBmpMessageRegistry.java | 4 ++-- .../bmp/spi/registry/SimpleBmpTlvRegistry.java | 2 +- .../spi/registry/SimpleBmpMessageRegistryTest.java | 3 +-- .../bmp/spi/registry/SimpleBmpTlvRegistryTest.java | 5 ++--- .../change/counter/TopologyDataChangeCounter.java | 4 ++-- .../blueprint/topology-data-change-counter.xml | 4 ++-- parent/pom.xml | 2 +- .../pcep/ietf/stateful07/PathBindingTlvParser.java | 4 ++-- .../Stateful07LSPIdentifierIpv4TlvParser.java | 2 +- .../stateful07/Stateful07RSVPErrorSpecTlvParser.java | 2 +- .../pcep/impl/TestVendorInformationTlvParser.java | 3 +-- .../segment/routing/AbstractSrSubobjectParser.java | 3 +-- .../protocol/pcep/spi/ObjectHeaderImpl.java | 3 +-- .../protocol/pcep/spi/UnknownObject.java | 3 +-- .../pcep/spi/pojo/SimpleEROSubobjectRegistry.java | 2 +- .../protocol/pcep/spi/pojo/SimpleLabelRegistry.java | 2 +- .../pcep/spi/pojo/SimpleMessageRegistry.java | 2 +- .../protocol/pcep/spi/pojo/SimpleObjectRegistry.java | 2 +- .../pcep/spi/pojo/SimpleRROSubobjectRegistry.java | 2 +- .../protocol/pcep/spi/pojo/SimpleTlvRegistry.java | 2 +- .../pojo/SimpleVendorInformationObjectRegistry.java | 2 +- .../spi/pojo/SimpleVendorInformationTlvRegistry.java | 2 +- .../pcep/spi/pojo/SimpleXROSubobjectRegistry.java | 2 +- .../org/opendaylight/protocol/pcep/spi/APITest.java | 2 +- .../opendaylight/protocol/pcep/spi/RegistryTest.java | 2 +- .../provider/AbstractTopologySessionListener.java | 3 +-- .../pcep/topology/provider/OperationResults.java | 3 +-- .../pcep/topology/provider/TopologyNodeState.java | 2 +- .../provider/session/stats/SessionStateImpl.java | 5 ++--- .../resources/OSGI-INF/blueprint/pcep-topology.xml | 4 ++-- .../stats/provider/TopologyStatsProviderImpl.java | 4 ++-- .../main/resources/OSGI-INF/blueprint/pcep-stats.xml | 2 +- .../provider/CreateTunnelInstructionExecutor.java | 2 +- .../pcep/tunnel/provider/NodeChangedListener.java | 2 +- .../pcep/tunnel/provider/TunelProgrammingUtil.java | 3 +-- .../OSGI-INF/blueprint/pcep-tunnel-provider.xml | 4 ++-- .../programming/impl/ProgrammingServiceImplTest.java | 2 +- .../parser/spi/pojo/SimpleEROSubobjectRegistry.java | 2 +- .../rsvp/parser/spi/pojo/SimpleLabelRegistry.java | 2 +- .../parser/spi/pojo/SimpleRROSubobjectRegistry.java | 2 +- .../parser/spi/pojo/SimpleRSVPObjectRegistry.java | 2 +- .../parser/spi/pojo/SimpleXROSubobjectRegistry.java | 2 +- ...erviceLoaderRSVPExtensionProviderContextTest.java | 12 ++++++------ .../parser/spi/pojo/SimpleLabelRegistryTest.java | 7 +++---- 83 files changed, 134 insertions(+), 143 deletions(-) diff --git a/bgp/benchmark-app/src/main/java/org/opendaylight/protocol/bgp/benchmark/app/AppPeerBenchmark.java b/bgp/benchmark-app/src/main/java/org/opendaylight/protocol/bgp/benchmark/app/AppPeerBenchmark.java index a485810590..00a03953bf 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 @@ -102,7 +102,7 @@ public class AppPeerBenchmark implements OdlBgpAppPeerBenchmarkService, Transact public AppPeerBenchmark(final DataBroker bindingDataBroker, final RpcProviderService rpcProviderRegistry, final String appRibId) { this.appRibId = requireNonNull(appRibId); - this.txChain = bindingDataBroker.createTransactionChain(this); + this.txChain = bindingDataBroker.createMergingTransactionChain(this); this.appIID = InstanceIdentifier.builder(ApplicationRib.class, new ApplicationRibKey(new ApplicationRibId(appRibId))).build(); diff --git a/bgp/benchmark-app/src/main/resources/OSGI-INF/blueprint/bgp-app-peer-benchmark.xml b/bgp/benchmark-app/src/main/resources/OSGI-INF/blueprint/bgp-app-peer-benchmark.xml index d98e7799aa..e940c09d87 100644 --- a/bgp/benchmark-app/src/main/resources/OSGI-INF/blueprint/bgp-app-peer-benchmark.xml +++ b/bgp/benchmark-app/src/main/resources/OSGI-INF/blueprint/bgp-app-peer-benchmark.xml @@ -8,7 +8,7 @@ --> - + - \ No newline at end of file + diff --git a/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/spi/pojo/SimpleEsiTypeRegistry.java b/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/spi/pojo/SimpleEsiTypeRegistry.java index 617b6be0d1..ab2b5eb5b4 100644 --- a/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/spi/pojo/SimpleEsiTypeRegistry.java +++ b/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/spi/pojo/SimpleEsiTypeRegistry.java @@ -84,7 +84,7 @@ public final class SimpleEsiTypeRegistry implements EsiRegistry { @Override public void serializeEsi(final Esi esi, final ByteBuf buffer) { - final EsiSerializer serializer = this.handlers.getSerializer(esi.getImplementedInterface()); + final EsiSerializer serializer = this.handlers.getSerializer(esi.implementedInterface()); if (serializer == null) { return; } diff --git a/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/spi/pojo/SimpleEvpnNlriRegistry.java b/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/spi/pojo/SimpleEvpnNlriRegistry.java index abbf241666..5520df773e 100644 --- a/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/spi/pojo/SimpleEvpnNlriRegistry.java +++ b/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/spi/pojo/SimpleEvpnNlriRegistry.java @@ -67,7 +67,7 @@ public final class SimpleEvpnNlriRegistry implements EvpnRegistry { @Override public ByteBuf serializeEvpn(final EvpnChoice evpn, final ByteBuf common) { - final EvpnSerializer serializer = this.handlers.getSerializer(evpn.getImplementedInterface()); + final EvpnSerializer serializer = this.handlers.getSerializer(evpn.implementedInterface()); if (serializer == null) { return common; } diff --git a/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/spi/pojo/SimpleEsiTypeRegistryTest.java b/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/spi/pojo/SimpleEsiTypeRegistryTest.java index 2b09606436..149db88a31 100644 --- a/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/spi/pojo/SimpleEsiTypeRegistryTest.java +++ b/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/spi/pojo/SimpleEsiTypeRegistryTest.java @@ -22,7 +22,6 @@ import org.opendaylight.protocol.bgp.evpn.impl.esi.types.RouterIdParserTest; import org.opendaylight.protocol.util.ByteArray; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev180329.esi.Esi; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev180329.evpn.routes.evpn.routes.EvpnRoute; -import org.opendaylight.yangtools.yang.binding.DataContainer; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ChoiceNode; @@ -34,7 +33,7 @@ public class SimpleEsiTypeRegistryTest { private class NotRegistered implements Esi { @Override - public Class getImplementedInterface() { + public Class implementedInterface() { return NotRegistered.class; } } @@ -80,4 +79,4 @@ public class SimpleEsiTypeRegistryTest { public void registryEmptyModelTest() { assertNull(SimpleEsiTypeRegistry.getInstance().parseEsiModel(null)); } -} \ No newline at end of file +} diff --git a/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/spi/pojo/SimpleEvpnNlriRegistryTest.java b/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/spi/pojo/SimpleEvpnNlriRegistryTest.java index 1a8d9f437a..bdb03d50ab 100644 --- a/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/spi/pojo/SimpleEvpnNlriRegistryTest.java +++ b/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/spi/pojo/SimpleEvpnNlriRegistryTest.java @@ -29,7 +29,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev180329.NlriType; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev180329.evpn.EvpnChoice; import org.opendaylight.yangtools.concepts.Registration; -import org.opendaylight.yangtools.yang.binding.DataContainer; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ChoiceNode; @@ -41,7 +40,7 @@ public final class SimpleEvpnNlriRegistryTest { private class NotRegistered implements EvpnChoice { @Override - public Class getImplementedInterface() { + public Class implementedInterface() { return NotRegistered.class; } } @@ -85,4 +84,4 @@ public final class SimpleEvpnNlriRegistryTest { .build()).build(); assertNull(SimpleEvpnNlriRegistry.getInstance().serializeEvpnModel(choice.build())); } -} \ No newline at end of file +} diff --git a/bgp/extensions/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecTypeRegistry.java b/bgp/extensions/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecTypeRegistry.java index 2e33f88553..6574d4d293 100644 --- a/bgp/extensions/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecTypeRegistry.java +++ b/bgp/extensions/flowspec/src/main/java/org/opendaylight/protocol/bgp/flowspec/SimpleFlowspecTypeRegistry.java @@ -26,7 +26,7 @@ public class SimpleFlowspecTypeRegistry { } public FlowspecTypeSerializer getFlowspecTypeSerializer(final FlowspecType fsType) { - return this.handlers.getSerializer(fsType.getImplementedInterface()); + return this.handlers.getSerializer(fsType.implementedInterface()); } public void serializeFlowspecType(final FlowspecType fsType, final ByteBuf output) { diff --git a/bgp/extensions/inet/src/main/java/org/opendaylight/protocol/bgp/inet/AbstractIPRibSupport.java b/bgp/extensions/inet/src/main/java/org/opendaylight/protocol/bgp/inet/AbstractIPRibSupport.java index fdd2cef0cc..d34c90fd65 100644 --- a/bgp/extensions/inet/src/main/java/org/opendaylight/protocol/bgp/inet/AbstractIPRibSupport.java +++ b/bgp/extensions/inet/src/main/java/org/opendaylight/protocol/bgp/inet/AbstractIPRibSupport.java @@ -24,6 +24,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib. import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.tables.Routes; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.AddressFamily; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.UnicastSubsequentAddressFamily; +import org.opendaylight.yangtools.yang.binding.BindingObject; import org.opendaylight.yangtools.yang.binding.ChildOf; import org.opendaylight.yangtools.yang.binding.ChoiceIn; import org.opendaylight.yangtools.yang.binding.DataObject; @@ -53,7 +54,7 @@ abstract class AbstractIPRibSupport< private static final Logger LOG = LoggerFactory.getLogger(AbstractIPRibSupport.class); private final NodeIdentifier prefixNid; private final NodeIdentifier nlriRoutesList; - private final ImmutableCollection> cacheableNlriObjects; + private final ImmutableCollection> cacheableNlriObjects; AbstractIPRibSupport( final BindingNormalizedNodeSerializer mappingService, @@ -75,7 +76,7 @@ abstract class AbstractIPRibSupport< } @Override - public final ImmutableCollection> cacheableNlriObjects() { + public final ImmutableCollection> cacheableNlriObjects() { return this.cacheableNlriObjects; } diff --git a/bgp/extensions/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/mcast/AbstractL3vpnMcastIpRIBSupport.java b/bgp/extensions/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/mcast/AbstractL3vpnMcastIpRIBSupport.java index b18bd32447..a0952a1dd3 100644 --- a/bgp/extensions/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/mcast/AbstractL3vpnMcastIpRIBSupport.java +++ b/bgp/extensions/l3vpn/src/main/java/org/opendaylight/protocol/bgp/l3vpn/mcast/AbstractL3vpnMcastIpRIBSupport.java @@ -34,6 +34,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mess import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.Tables; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.tables.Routes; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.AddressFamily; +import org.opendaylight.yangtools.yang.binding.BindingObject; import org.opendaylight.yangtools.yang.binding.ChildOf; import org.opendaylight.yangtools.yang.binding.ChoiceIn; import org.opendaylight.yangtools.yang.binding.DataObject; @@ -64,7 +65,7 @@ abstract class AbstractL3vpnMcastIpRIBSupport< private static final Logger LOG = LoggerFactory.getLogger(AbstractL3vpnMcastIpRIBSupport.class); private final NodeIdentifier nlriRoutesList; private final NodeIdentifier rdNid; - private final ImmutableCollection> cacheableNlriObjects; + private final ImmutableCollection> cacheableNlriObjects; /** * Default constructor. Requires the QName of the container augmented under the routes choice @@ -95,7 +96,7 @@ abstract class AbstractL3vpnMcastIpRIBSupport< } @Override - public final ImmutableCollection> cacheableNlriObjects() { + public final ImmutableCollection> cacheableNlriObjects() { return this.cacheableNlriObjects; } diff --git a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/SrLinkAttributesParser.java b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/SrLinkAttributesParser.java index 94729123de..460eb2ae1f 100644 --- a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/SrLinkAttributesParser.java +++ b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/sr/SrLinkAttributesParser.java @@ -31,7 +31,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.segm import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.segment.routing.ext.rev151014.adj.flags.flags.OspfAdjFlagsCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.segment.routing.ext.rev151014.sid.label.index.SidLabelIndex; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network.concepts.rev131125.IsoSystemIdentifier; -import org.opendaylight.yangtools.yang.binding.DataContainer; public final class SrLinkAttributesParser { @@ -103,7 +102,7 @@ public final class SrLinkAttributesParser { } return new EpeAdjSidTlv() { @Override - public Class getImplementedInterface() { + public Class implementedInterface() { return EpeAdjSidTlv.class; } diff --git a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/AbstractNodeDescriptorTlvCodec.java b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/AbstractNodeDescriptorTlvCodec.java index 3995b5ac3d..c19c7635ab 100644 --- a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/AbstractNodeDescriptorTlvCodec.java +++ b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/AbstractNodeDescriptorTlvCodec.java @@ -15,7 +15,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.link import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.DomainIdentifier; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.NodeIdentifier; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.node.identifier.CRouterIdentifier; -import org.opendaylight.yangtools.yang.binding.DataContainer; import org.opendaylight.yangtools.yang.common.QName; abstract class AbstractNodeDescriptorTlvCodec { @@ -28,7 +27,7 @@ abstract class AbstractNodeDescriptorTlvCodec { return new NodeIdentifier() { @Override - public Class getImplementedInterface() { + public Class implementedInterface() { return NodeIdentifier.class; } diff --git a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/LinkIdTlvParser.java b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/LinkIdTlvParser.java index 72a321d3a4..7bbf2680d1 100644 --- a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/LinkIdTlvParser.java +++ b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/tlvs/LinkIdTlvParser.java @@ -11,7 +11,6 @@ import io.netty.buffer.ByteBuf; import org.opendaylight.protocol.bgp.linkstate.spi.LinkstateTlvParser; import org.opendaylight.protocol.util.ByteBufWriteUtil; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev180329.LinkLrIdentifiers; -import org.opendaylight.yangtools.yang.binding.DataContainer; import org.opendaylight.yangtools.yang.common.QName; public final class LinkIdTlvParser implements LinkstateTlvParser.LinkstateTlvSerializer, @@ -31,7 +30,7 @@ public final class LinkIdTlvParser implements LinkstateTlvParser.LinkstateTlvSer final long remoteId = value.readUnsignedInt(); return new LinkLrIdentifiers() { @Override - public Class getImplementedInterface() { + public Class implementedInterface() { return LinkLrIdentifiers.class; } @@ -56,4 +55,4 @@ public final class LinkIdTlvParser implements LinkstateTlvParser.LinkstateTlvSer public int getType() { return LINK_LR_IDENTIFIERS; } -} \ No newline at end of file +} diff --git a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/spi/pojo/SimpleBindingSubTlvsRegistry.java b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/spi/pojo/SimpleBindingSubTlvsRegistry.java index 36e1a9f43c..e2f32350f3 100644 --- a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/spi/pojo/SimpleBindingSubTlvsRegistry.java +++ b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/spi/pojo/SimpleBindingSubTlvsRegistry.java @@ -49,7 +49,7 @@ public final class SimpleBindingSubTlvsRegistry { for (final BindingSubTlvs subTlv : bindingSubTlvs) { final BindingSubTlv bindingSubTlv = subTlv.getBindingSubTlv(); final BindingSubTlvsSerializer serializer = this.handlers.getSerializer( - bindingSubTlv.getImplementedInterface()); + bindingSubTlv.implementedInterface()); if (serializer == null) { LOG.info("Unknown binding sub Tlv type {}", subTlv); return; diff --git a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/spi/pojo/SimpleNlriTypeRegistry.java b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/spi/pojo/SimpleNlriTypeRegistry.java index 84ae4d0de7..adb8d1b3d8 100644 --- a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/spi/pojo/SimpleNlriTypeRegistry.java +++ b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/spi/pojo/SimpleNlriTypeRegistry.java @@ -80,9 +80,9 @@ public final class SimpleNlriTypeRegistry { requireNonNull(byteAggregator); final ObjectType objectType = nlri.getObjectType(); final NlriTypeCaseSerializer serializer = this.nlriRegistry - .getSerializer((Class) objectType.getImplementedInterface()); + .getSerializer((Class) objectType.implementedInterface()); if (serializer == null) { - LOG.warn("Linkstate NLRI serializer for Type: {} was not found.", objectType.getImplementedInterface()); + LOG.warn("Linkstate NLRI serializer for Type: {} was not found.", objectType.implementedInterface()); return; } final ByteBuf nlriType = Unpooled.buffer(); diff --git a/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/impl/AbstractMvpnRIBSupport.java b/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/impl/AbstractMvpnRIBSupport.java index e9060805ec..ceb3bc5ad9 100644 --- a/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/impl/AbstractMvpnRIBSupport.java +++ b/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/impl/AbstractMvpnRIBSupport.java @@ -29,6 +29,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.Tables; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.tables.Routes; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.AddressFamily; +import org.opendaylight.yangtools.yang.binding.BindingObject; import org.opendaylight.yangtools.yang.binding.ChildOf; import org.opendaylight.yangtools.yang.binding.ChoiceIn; import org.opendaylight.yangtools.yang.binding.DataObject; @@ -54,7 +55,7 @@ abstract class AbstractMvpnRIBSupport & MvpnRoutes> extends AbstractRIBSupport { private static final Logger LOG = LoggerFactory.getLogger(AbstractMvpnRIBSupport.class); private final NodeIdentifier nlriRoutesList; - private final ImmutableCollection> cacheableNlriObjects; + private final ImmutableCollection> cacheableNlriObjects; /** * Default constructor. Requires the QName of the container augmented under the routes choice @@ -83,7 +84,7 @@ abstract class AbstractMvpnRIBSupport> cacheableNlriObjects() { + public final ImmutableCollection> cacheableNlriObjects() { return this.cacheableNlriObjects; } diff --git a/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/spi/pojo/attributes/tunnel/identifier/SimpleTunnelIdentifierRegistry.java b/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/spi/pojo/attributes/tunnel/identifier/SimpleTunnelIdentifierRegistry.java index af0d3e9b38..56839de853 100644 --- a/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/spi/pojo/attributes/tunnel/identifier/SimpleTunnelIdentifierRegistry.java +++ b/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/spi/pojo/attributes/tunnel/identifier/SimpleTunnelIdentifierRegistry.java @@ -45,7 +45,7 @@ public final class SimpleTunnelIdentifierRegistry { LOG.debug("Skipping serialization of null PMSI Tunnel Attribute"); return NO_TUNNEL_INFORMATION_PRESENT; } - final TunnelIdentifierSerializer serializer = this.handlers.getSerializer(tunnel.getImplementedInterface()); + final TunnelIdentifierSerializer serializer = this.handlers.getSerializer(tunnel.implementedInterface()); if (serializer == null) { LOG.debug("Skipping serialization of PMSI Tunnel Attribute {}", tunnel); return NO_TUNNEL_INFORMATION_PRESENT; diff --git a/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/spi/pojo/nlri/SimpleMvpnNlriRegistry.java b/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/spi/pojo/nlri/SimpleMvpnNlriRegistry.java index e04ba63a4a..1dd2d18283 100644 --- a/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/spi/pojo/nlri/SimpleMvpnNlriRegistry.java +++ b/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/spi/pojo/nlri/SimpleMvpnNlriRegistry.java @@ -57,7 +57,7 @@ public final class SimpleMvpnNlriRegistry implements MvpnRegistry { @Override public ByteBuf serializeMvpn(final MvpnChoice mvpn) { - final MvpnSerializer serializer = this.handlers.getSerializer(mvpn.getImplementedInterface()); + final MvpnSerializer serializer = this.handlers.getSerializer(mvpn.implementedInterface()); if (serializer == null) { return Unpooled.buffer(); } diff --git a/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/tunnel/identifier/PAddressPMulticastGroupUtilTest.java b/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/tunnel/identifier/PAddressPMulticastGroupUtilTest.java index a088285faf..72266a9572 100644 --- a/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/tunnel/identifier/PAddressPMulticastGroupUtilTest.java +++ b/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/impl/attributes/tunnel/identifier/PAddressPMulticastGroupUtilTest.java @@ -22,7 +22,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types. import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pmsi.tunnel.rev180329.PAddressPMulticastGroup; -import org.opendaylight.yangtools.yang.binding.DataContainer; public final class PAddressPMulticastGroupUtilTest { private static final String IPV6_MODEL = "2001::1"; @@ -79,8 +78,8 @@ public final class PAddressPMulticastGroupUtilTest { } @Override - public Class getImplementedInterface() { - return null; + public Class implementedInterface() { + return MyPAddressPMulticastGroup.class; } } -} \ No newline at end of file +} diff --git a/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/spi/pojo/nlri/SimpleMvpnNlriRegistryTest.java b/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/spi/pojo/nlri/SimpleMvpnNlriRegistryTest.java index 8654430009..8fd31ce7ad 100644 --- a/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/spi/pojo/nlri/SimpleMvpnNlriRegistryTest.java +++ b/bgp/extensions/mvpn/src/test/java/org/opendaylight/protocol/bgp/mvpn/spi/pojo/nlri/SimpleMvpnNlriRegistryTest.java @@ -18,7 +18,6 @@ import org.junit.Test; import org.opendaylight.protocol.bgp.mvpn.impl.NlriActivator; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.NlriType; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mvpn.rev180417.mvpn.MvpnChoice; -import org.opendaylight.yangtools.yang.binding.DataContainer; public final class SimpleMvpnNlriRegistryTest { @Before @@ -40,9 +39,9 @@ public final class SimpleMvpnNlriRegistryTest { private class NotRegistered implements MvpnChoice { @Override - public Class getImplementedInterface() { + public Class implementedInterface() { return NotRegistered.class; } } -} \ No newline at end of file +} diff --git a/bgp/extensions/route-target/src/main/java/org/opendaylight/protocol/bgp/route/targetcontrain/impl/RouteTargetConstrainRIBSupport.java b/bgp/extensions/route-target/src/main/java/org/opendaylight/protocol/bgp/route/targetcontrain/impl/RouteTargetConstrainRIBSupport.java index f0b1deab7c..a2cdcdc4d1 100644 --- a/bgp/extensions/route-target/src/main/java/org/opendaylight/protocol/bgp/route/targetcontrain/impl/RouteTargetConstrainRIBSupport.java +++ b/bgp/extensions/route-target/src/main/java/org/opendaylight/protocol/bgp/route/targetcontrain/impl/RouteTargetConstrainRIBSupport.java @@ -46,6 +46,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rout import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.route.target.constrain.rev180618.update.attributes.mp.reach.nlri.advertized.routes.destination.type.destination.route.target.constrain.advertized._case.DestinationRouteTargetConstrainBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.route.target.constrain.rev180618.update.attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationRouteTargetConstrainWithdrawnCaseBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.Ipv4AddressFamily; +import org.opendaylight.yangtools.yang.binding.BindingObject; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; @@ -80,7 +81,7 @@ public final class RouteTargetConstrainRIBSupport new RouteTargetConstrainRoutesCaseBuilder().setRouteTargetConstrainRoutes(EMPTY_CONTAINER).build(); private static final String ORIGIN_AS = "origin-as"; private static RouteTargetConstrainRIBSupport SINGLETON; - private final ImmutableCollection> cacheableNlriObjects + private final ImmutableCollection> cacheableNlriObjects = ImmutableSet.of(RouteTargetConstrainRoutesCase.class); private final NodeIdentifier originAsNid; @@ -112,7 +113,7 @@ public final class RouteTargetConstrainRIBSupport } @Override - public ImmutableCollection> cacheableNlriObjects() { + public ImmutableCollection> cacheableNlriObjects() { return this.cacheableNlriObjects; } @@ -232,7 +233,7 @@ public final class RouteTargetConstrainRIBSupport } @Override - public List extractAdjRibInRoutes(Routes routes) { + public List extractAdjRibInRoutes(final Routes routes) { verify(routes instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.route.target .constrain.rev180618.bgp.rib.rib.peer.adj.rib.in.tables.routes.RouteTargetConstrainRoutesCase, "Unrecognized routes %s", routes); diff --git a/bgp/extensions/route-target/src/main/java/org/opendaylight/protocol/bgp/route/targetcontrain/impl/nlri/SimpleRouteTargetConstrainNlriRegistry.java b/bgp/extensions/route-target/src/main/java/org/opendaylight/protocol/bgp/route/targetcontrain/impl/nlri/SimpleRouteTargetConstrainNlriRegistry.java index 44afa4317e..28f24ee160 100644 --- a/bgp/extensions/route-target/src/main/java/org/opendaylight/protocol/bgp/route/targetcontrain/impl/nlri/SimpleRouteTargetConstrainNlriRegistry.java +++ b/bgp/extensions/route-target/src/main/java/org/opendaylight/protocol/bgp/route/targetcontrain/impl/nlri/SimpleRouteTargetConstrainNlriRegistry.java @@ -70,7 +70,7 @@ public final class SimpleRouteTargetConstrainNlriRegistry implements RouteTargeC @SuppressWarnings("unchecked") public ByteBuf serializeRouteTargetConstrain(final RouteTargetConstrainChoice routeTarget) { final RouteTargetConstrainSerializer serializer - = this.handlers.getSerializer(routeTarget.getImplementedInterface()); + = this.handlers.getSerializer(routeTarget.implementedInterface()); if (serializer == null || serializer.getType() == null) { return Unpooled.buffer(); } diff --git a/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/BgpTableTypeImpl.java b/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/BgpTableTypeImpl.java index bcb6d8c8c8..36ed49c182 100644 --- a/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/BgpTableTypeImpl.java +++ b/bgp/parser-api/src/main/java/org/opendaylight/protocol/bgp/parser/BgpTableTypeImpl.java @@ -35,7 +35,7 @@ public final class BgpTableTypeImpl implements BgpTableType { } @Override - public Class getImplementedInterface() { + public Class implementedInterface() { return BgpTableType.class; } diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/CapabilityParameterParser.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/CapabilityParameterParser.java index 7c62e6b80b..f5f547909d 100644 --- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/CapabilityParameterParser.java +++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/CapabilityParameterParser.java @@ -93,7 +93,7 @@ public final class CapabilityParameterParser implements ParameterParser, Paramet final CParameters cap = optionalCapa.getCParameters(); final ByteBuf bytes = Unpooled.buffer(); this.reg.serializeCapability(cap, bytes); - Preconditions.checkArgument(bytes != null, "Unhandled capability class %s", cap.getImplementedInterface()); + Preconditions.checkArgument(bytes != null, "Unhandled capability class %s", cap.implementedInterface()); if (LOG.isTraceEnabled()) { LOG.trace("BGP capability serialized to: {}", ByteBufUtil.hexDump(bytes)); diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleBgpPrefixSidTlvRegistry.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleBgpPrefixSidTlvRegistry.java index 24b1db113b..585e272480 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleBgpPrefixSidTlvRegistry.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleBgpPrefixSidTlvRegistry.java @@ -51,7 +51,7 @@ public final class SimpleBgpPrefixSidTlvRegistry implements BgpPrefixSidTlvRegis @Override public void serializeBgpPrefixSidTlv(final BgpPrefixSidTlv tlv, final ByteBuf bytes) { - final BgpPrefixSidTlvSerializer serializer = this.handlers.getSerializer(tlv.getImplementedInterface()); + final BgpPrefixSidTlvSerializer serializer = this.handlers.getSerializer(tlv.implementedInterface()); if (serializer == null) { return; } diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleExtendedCommunityRegistry.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleExtendedCommunityRegistry.java index c96f7225a2..eb8a87a918 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleExtendedCommunityRegistry.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleExtendedCommunityRegistry.java @@ -60,7 +60,7 @@ final class SimpleExtendedCommunityRegistry implements ExtendedCommunityRegistry @Override public void serializeExtendedCommunity(final ExtendedCommunities extendedCommunity, final ByteBuf byteAggregator) { final ExtendedCommunitySerializer serializer = this.handlers.getSerializer(extendedCommunity - .getExtendedCommunity().getImplementedInterface()); + .getExtendedCommunity().implementedInterface()); if (serializer == null) { return; } diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleMessageRegistry.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleMessageRegistry.java index 1fb04f25d4..38499bb73d 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleMessageRegistry.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleMessageRegistry.java @@ -34,7 +34,7 @@ final class SimpleMessageRegistry extends AbstractMessageRegistry { @Override protected void serializeMessageImpl(final Notification message, final ByteBuf buffer) { - final MessageSerializer serializer = this.handlers.getSerializer(message.getImplementedInterface()); + final MessageSerializer serializer = this.handlers.getSerializer(message.implementedInterface()); if (serializer == null) { return; } diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleNlriRegistry.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleNlriRegistry.java index d0c71064d2..d215c60553 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleNlriRegistry.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleNlriRegistry.java @@ -178,7 +178,7 @@ final class SimpleNlriRegistry implements NlriRegistry { final CNextHop cNextHop = mpReachNlri.getCNextHop(); if (cNextHop != null) { final Entry, BgpTableType> key = new SimpleEntry( - cNextHop.getImplementedInterface(), new BgpTableTypeImpl(afi, safi)); + cNextHop.implementedInterface(), new BgpTableTypeImpl(afi, safi)); final NextHopParserSerializer nextHopSerializer = this.nextHopSerializers.get(key); final ByteBuf nextHopBuffer = Unpooled.buffer(); nextHopSerializer.serializeNextHop(cNextHop, nextHopBuffer); diff --git a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleParameterRegistry.java b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleParameterRegistry.java index 07bff4b06e..527d04ca2a 100644 --- a/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleParameterRegistry.java +++ b/bgp/parser-spi/src/main/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleParameterRegistry.java @@ -48,7 +48,7 @@ final class SimpleParameterRegistry implements ParameterRegistry { @Override public void serializeParameter(final BgpParameters parameter, final ByteBuf bytes) { - final ParameterSerializer serializer = this.handlers.getSerializer(parameter.getImplementedInterface()); + final ParameterSerializer serializer = this.handlers.getSerializer(parameter.implementedInterface()); if (serializer == null) { return; } diff --git a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleRegistryTest.java b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleRegistryTest.java index bfbb5ff218..9a9515c7d3 100644 --- a/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleRegistryTest.java +++ b/bgp/parser-spi/src/test/java/org/opendaylight/protocol/bgp/parser/spi/pojo/SimpleRegistryTest.java @@ -98,7 +98,7 @@ public class SimpleRegistryTest { public void testSimpleParameter() throws Exception { final ParameterRegistry paramReg = this.ctx.getParameterRegistry(); final BgpParameters param = mock(BgpParameters.class); - Mockito.doReturn(BgpParameters.class).when(param).getImplementedInterface(); + Mockito.doReturn(BgpParameters.class).when(param).implementedInterface(); final byte[] paramBytes = { 0x00, 0x00 }; @@ -128,7 +128,7 @@ public class SimpleRegistryTest { }; final BgpPrefixSidTlv tlv = mock(BgpPrefixSidTlv.class); - doReturn(BgpPrefixSidTlv.class).when(tlv).getImplementedInterface(); + doReturn(BgpPrefixSidTlv.class).when(tlv).implementedInterface(); final ByteBuf buffer = Unpooled.buffer(tlvBytes.length); sidTlvReg.serializeBgpPrefixSidTlv(tlv, buffer); @@ -151,7 +151,7 @@ public class SimpleRegistryTest { (byte) 0x00, (byte) 0x13, (byte) 0x00 }; final Notification msg = mock(Notification.class); - doReturn(Notification.class).when(msg).getImplementedInterface(); + doReturn(Notification.class).when(msg).implementedInterface(); final ByteBuf buffer = Unpooled.buffer(msgBytes.length); msgRegistry.serializeMessage(msg, buffer); diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/CodecsImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/CodecsImpl.java index b4db9a738d..80518e098c 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/CodecsImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/CodecsImpl.java @@ -14,7 +14,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet.Builder; import java.util.Set; import org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTree; -import org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTreeNode; +import org.opendaylight.mdsal.binding.dom.codec.api.BindingDataObjectCodecTreeNode; import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeCachingCodec; import org.opendaylight.protocol.bgp.rib.impl.spi.Codecs; import org.opendaylight.protocol.bgp.rib.spi.RIBSupport; @@ -44,6 +44,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib. import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.BgpAggregator; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.Community; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.ExtendedCommunity; +import org.opendaylight.yangtools.yang.binding.BindingObject; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; @@ -84,7 +85,7 @@ public final class CodecsImpl implements Codecs { ATTRIBUTE_CACHEABLES = acb.build(); } - private final ImmutableSet> cacheableAttributes; + private final ImmutableSet> cacheableAttributes; private BindingNormalizedNodeCachingCodec attributesCodec; private BindingNormalizedNodeCachingCodec reachNlriCodec; private BindingNormalizedNodeCachingCodec unreachNlriCodec; @@ -93,7 +94,7 @@ public final class CodecsImpl implements Codecs { public CodecsImpl(final RIBSupport ribSupport) { this.ribSupport = requireNonNull(ribSupport); - final Builder> acb = ImmutableSet.builder(); + final Builder> acb = ImmutableSet.builder(); acb.addAll(ATTRIBUTE_CACHEABLES); acb.addAll(this.ribSupport.cacheableAttributeObjects()); this.cacheableAttributes = acb.build(); @@ -104,8 +105,8 @@ public final class CodecsImpl implements Codecs { public void onCodecTreeUpdated(final BindingCodecTree tree) { @SuppressWarnings("rawtypes") - final BindingCodecTreeNode tableCodecContext = tree.getSubtreeCodec(TABLE_BASE_II); - final BindingCodecTreeNode routeListCodec = tableCodecContext + final BindingDataObjectCodecTreeNode tableCodecContext = tree.getSubtreeCodec(TABLE_BASE_II); + final BindingDataObjectCodecTreeNode routeListCodec = tableCodecContext .streamChild(Routes.class) .streamChild(this.ribSupport.routesCaseClass()) .streamChild(this.ribSupport.routesContainerClass()) diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupport.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupport.java index 694cfb1ef9..eeca838011 100644 --- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupport.java +++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupport.java @@ -25,6 +25,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib. import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.tables.Routes; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.AddressFamily; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.SubsequentAddressFamily; +import org.opendaylight.yangtools.yang.binding.BindingObject; import org.opendaylight.yangtools.yang.binding.ChildOf; import org.opendaylight.yangtools.yang.binding.ChoiceIn; import org.opendaylight.yangtools.yang.binding.DataObject; @@ -96,12 +97,12 @@ public interface RIBSupport< Class routesListClass(); @Nonnull - default ImmutableCollection> cacheableAttributeObjects() { + default ImmutableCollection> cacheableAttributeObjects() { return ImmutableSet.of(); } @Nonnull - default ImmutableCollection> cacheableNlriObjects() { + default ImmutableCollection> cacheableNlriObjects() { return ImmutableSet.of(); } diff --git a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupportTest.java b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupportTest.java index e4ef3c47be..b73908baea 100644 --- a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupportTest.java +++ b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupportTest.java @@ -161,7 +161,7 @@ public abstract class AbstractRIBSupportTest createRoutes(final S routes) { - Preconditions.checkArgument(routes.getImplementedInterface() + Preconditions.checkArgument(routes.implementedInterface() .equals(this.abstractRIBSupport.routesContainerClass())); final InstanceIdentifier routesIId = routesIId(); final Map.Entry> normalizedNode = this.mappingService 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 dcdab13d57..e17070913a 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 @@ -83,7 +83,7 @@ abstract class AbstractReachabilityTopologyBuilder extends Abst return new NodeId(ipv6.getGlobal().getValue()); } else { - LOG.warn("Unhandled next hop class {}", nh.getImplementedInterface()); + LOG.warn("Unhandled next hop class {}", nh.implementedInterface()); return null; } } diff --git a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilder.java b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilder.java index 984d8e1a0a..19baea8d1d 100644 --- a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilder.java +++ b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/LinkstateTopologyBuilder.java @@ -647,7 +647,7 @@ public class LinkstateTopologyBuilder extends AbstractTopologyBuilder org.opendaylight.mdsal binding-parent - 3.0.6 + 4.0.0 diff --git a/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterPeerImpl.java b/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterPeerImpl.java index d3e6a3914f..e60dc8d606 100644 --- a/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterPeerImpl.java +++ b/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/BmpRouterPeerImpl.java @@ -22,7 +22,7 @@ import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction; import org.opendaylight.controller.md.sal.dom.api.DOMTransactionChain; import org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTree; -import org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTreeNode; +import org.opendaylight.mdsal.binding.dom.codec.api.BindingDataObjectCodecTreeNode; import org.opendaylight.mdsal.common.api.CommitInfo; import org.opendaylight.protocol.bgp.rib.spi.RIBExtensionConsumerContext; import org.opendaylight.protocol.bmp.impl.spi.BmpRouterPeer; @@ -130,8 +130,8 @@ public final class BmpRouterPeerImpl implements BmpRouterPeer { private final YangInstanceIdentifier peerYangIId; private final BmpRibInWriter prePolicyWriter; private final BmpRibInWriter postPolicyWriter; - private final BindingCodecTreeNode sentOpenCodec; - private final BindingCodecTreeNode receivedOpenCodec; + private final BindingDataObjectCodecTreeNode sentOpenCodec; + private final BindingDataObjectCodecTreeNode receivedOpenCodec; private boolean up = true; private BmpRouterPeerImpl(final DOMTransactionChain domTxChain, final YangInstanceIdentifier peersYangIId, diff --git a/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TableContext.java b/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TableContext.java index f3471a67dd..aa92c187d9 100644 --- a/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TableContext.java +++ b/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TableContext.java @@ -19,6 +19,7 @@ import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction; import org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTree; import org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTreeNode; +import org.opendaylight.mdsal.binding.dom.codec.api.BindingDataObjectCodecTreeNode; import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeCachingCodec; import org.opendaylight.protocol.bgp.rib.spi.RIBSupport; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Update; @@ -28,7 +29,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mult 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.update.attributes.MpReachNlri; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.update.attributes.MpUnreachNlri; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.Route; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.tables.Routes; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.QName; @@ -65,7 +65,8 @@ final class TableContext { this.tableSupport = requireNonNull(tableSupport); this.tableId = requireNonNull(tableId); final BindingCodecTreeNode tableCodecContext = tree.getSubtreeCodec(tableId); - final BindingCodecTreeNode routeListCodec = tableCodecContext + Preconditions.checkState(tableCodecContext instanceof BindingDataObjectCodecTreeNode); + final BindingDataObjectCodecTreeNode routeListCodec = ((BindingDataObjectCodecTreeNode)tableCodecContext) .streamChild(Routes.class) .streamChild(this.tableSupport.routesCaseClass()) .streamChild(this.tableSupport.routesContainerClass()) diff --git a/bmp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/registry/SimpleBmpMessageRegistry.java b/bmp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/registry/SimpleBmpMessageRegistry.java index 4f0efa646c..f8efc27a0a 100644 --- a/bmp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/registry/SimpleBmpMessageRegistry.java +++ b/bmp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/registry/SimpleBmpMessageRegistry.java @@ -56,7 +56,7 @@ public class SimpleBmpMessageRegistry implements BmpMessageRegistry { @Override public void serializeMessage(final Notification message, final ByteBuf buffer) { - final BmpMessageSerializer serializer = this.handlers.getSerializer(message.getImplementedInterface()); + final BmpMessageSerializer serializer = this.handlers.getSerializer(message.implementedInterface()); if (serializer == null) { LOG.warn("BMP serializer for message type {} is not registered.", message.getClass()); return; @@ -82,4 +82,4 @@ public class SimpleBmpMessageRegistry implements BmpMessageRegistry { } return msgType; } -} \ No newline at end of file +} diff --git a/bmp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/registry/SimpleBmpTlvRegistry.java b/bmp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/registry/SimpleBmpTlvRegistry.java index be1b7b64c8..e046625173 100644 --- a/bmp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/registry/SimpleBmpTlvRegistry.java +++ b/bmp/bmp-spi/src/main/java/org/opendaylight/protocol/bmp/spi/registry/SimpleBmpTlvRegistry.java @@ -30,7 +30,7 @@ public class SimpleBmpTlvRegistry implements BmpTlvRegistry { @Override public void serializeTlv(final Tlv tlv, final ByteBuf output) { - final BmpTlvSerializer serializer = this.handlers.getSerializer(tlv.getImplementedInterface()); + final BmpTlvSerializer serializer = this.handlers.getSerializer(tlv.implementedInterface()); if (serializer == null) { LOG.warn("BMP serializer for TLV type {} is not registered.", tlv.getClass()); return; diff --git a/bmp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/registry/SimpleBmpMessageRegistryTest.java b/bmp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/registry/SimpleBmpMessageRegistryTest.java index fe76838ab0..336e0bdc6f 100644 --- a/bmp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/registry/SimpleBmpMessageRegistryTest.java +++ b/bmp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/registry/SimpleBmpMessageRegistryTest.java @@ -18,7 +18,6 @@ import org.opendaylight.protocol.bmp.spi.parser.AbstractBmpMessageParser; import org.opendaylight.protocol.bmp.spi.parser.BmpDeserializationException; import org.opendaylight.protocol.util.ByteArray; import org.opendaylight.protocol.util.ByteBufWriteUtil; -import org.opendaylight.yangtools.yang.binding.DataContainer; import org.opendaylight.yangtools.yang.binding.Notification; public class SimpleBmpMessageRegistryTest { @@ -104,7 +103,7 @@ public class SimpleBmpMessageRegistryTest { } @Override - public Class getImplementedInterface() { + public Class implementedInterface() { return BmpTestMessage.class; } diff --git a/bmp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/registry/SimpleBmpTlvRegistryTest.java b/bmp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/registry/SimpleBmpTlvRegistryTest.java index 930ce8669f..fa2c503e40 100644 --- a/bmp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/registry/SimpleBmpTlvRegistryTest.java +++ b/bmp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/registry/SimpleBmpTlvRegistryTest.java @@ -24,7 +24,6 @@ import org.opendaylight.protocol.bmp.spi.parser.BmpDeserializationException; import org.opendaylight.protocol.bmp.spi.parser.BmpTlvParser; import org.opendaylight.protocol.bmp.spi.parser.BmpTlvSerializer; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev180329.Tlv; -import org.opendaylight.yangtools.yang.binding.DataContainer; public class SimpleBmpTlvRegistryTest { @@ -81,7 +80,7 @@ public class SimpleBmpTlvRegistryTest { private final class MockDescriptionTlv implements Tlv { @Override - public Class getImplementedInterface() { + public Class implementedInterface() { return MockDescriptionTlv.class; } } @@ -89,7 +88,7 @@ public class SimpleBmpTlvRegistryTest { private final class MockTlv implements Tlv { @Override - public Class getImplementedInterface() { + public Class implementedInterface() { return MockTlv.class; } diff --git a/data-change-counter/src/main/java/org/opendaylight/protocol/data/change/counter/TopologyDataChangeCounter.java b/data-change-counter/src/main/java/org/opendaylight/protocol/data/change/counter/TopologyDataChangeCounter.java index 27c33c176c..0fe99669d0 100644 --- a/data-change-counter/src/main/java/org/opendaylight/protocol/data/change/counter/TopologyDataChangeCounter.java +++ b/data-change-counter/src/main/java/org/opendaylight/protocol/data/change/counter/TopologyDataChangeCounter.java @@ -52,7 +52,7 @@ final class TopologyDataChangeCounter implements ClusteredDataTreeChangeListener TopologyDataChangeCounter(final DataBroker dataBroker, final String counterId, final String topologyName) { this.dataBroker = dataBroker; - this.transactionChain = this.dataBroker.createTransactionChain(this); + this.transactionChain = this.dataBroker.createMergingTransactionChain(this); this.counterId = counterId; this.counterInstanceId = InstanceIdentifier.builder(DataChangeCounter.class) .child(Counter.class, new CounterKey(this.counterId)).build(); @@ -109,7 +109,7 @@ final class TopologyDataChangeCounter implements ClusteredDataTreeChangeListener LOG.warn("Transaction chain failure. Transaction: {}", transaction, cause); if (!closed.get()) { this.transactionChain.close(); - this.transactionChain = dataBroker.createTransactionChain(this); + this.transactionChain = dataBroker.createMergingTransactionChain(this); } } diff --git a/data-change-counter/src/main/resources/OSGI-INF/blueprint/topology-data-change-counter.xml b/data-change-counter/src/main/resources/OSGI-INF/blueprint/topology-data-change-counter.xml index 23fc02c5f2..254f058b20 100644 --- a/data-change-counter/src/main/resources/OSGI-INF/blueprint/topology-data-change-counter.xml +++ b/data-change-counter/src/main/resources/OSGI-INF/blueprint/topology-data-change-counter.xml @@ -7,11 +7,11 @@ - + - \ No newline at end of file + diff --git a/parent/pom.xml b/parent/pom.xml index 59a9932b18..daa7436fba 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -59,7 +59,7 @@ org.opendaylight.mdsal mdsal-artifacts - 3.0.6 + 4.0.0 pom import 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 1778735380..fa32e69aa7 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 @@ -78,9 +78,9 @@ public final class PathBindingTlvParser implements TlvParser, TlvSerializer { Preconditions.checkArgument(bindingTypeValue != null, "Missing Binding Value in Path Bidning TLV: %s", pTlv); final ByteBuf body = Unpooled.buffer(MPLS_BINDING_LENGTH); - final PathBindingTlvCodec codec = BT_SERIALIZERS.get(bindingTypeValue.getImplementedInterface()); + final PathBindingTlvCodec codec = BT_SERIALIZERS.get(bindingTypeValue.implementedInterface()); Preconditions.checkArgument(codec != null, - "Unsupported Path Binding Type: %s", bindingTypeValue.getImplementedInterface()); + "Unsupported Path Binding Type: %s", bindingTypeValue.implementedInterface()); ByteBufWriteUtil.writeUnsignedShort(codec.getBindingType(), body); body.writeBytes(codec.serialize(bindingTypeValue)); diff --git a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07LSPIdentifierIpv4TlvParser.java b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07LSPIdentifierIpv4TlvParser.java index 702491c9a9..acfe3d7d51 100644 --- a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07LSPIdentifierIpv4TlvParser.java +++ b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07LSPIdentifierIpv4TlvParser.java @@ -64,7 +64,7 @@ public final class Stateful07LSPIdentifierIpv4TlvParser implements TlvParser, Tl final LspIdentifiers lsp = (LspIdentifiers) tlv; final AddressFamily afi = lsp.getAddressFamily(); final ByteBuf body = Unpooled.buffer(); - if (afi.getImplementedInterface().equals(Ipv6Case.class)) { + if (afi.implementedInterface().equals(Ipv6Case.class)) { new Stateful07LSPIdentifierIpv6TlvParser().serializeTlv(tlv, buffer); } final Ipv4 ipv4 = ((Ipv4Case) afi).getIpv4(); diff --git a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07RSVPErrorSpecTlvParser.java b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07RSVPErrorSpecTlvParser.java index e4ab1187b4..f870009506 100644 --- a/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07RSVPErrorSpecTlvParser.java +++ b/pcep/ietf-stateful07/src/main/java/org/opendaylight/protocol/pcep/ietf/stateful07/Stateful07RSVPErrorSpecTlvParser.java @@ -84,7 +84,7 @@ public final class Stateful07RSVPErrorSpecTlvParser implements TlvParser, TlvSer Preconditions.checkArgument(tlv instanceof RsvpErrorSpec, "RSVPErrorSpecTlv is mandatory."); final RsvpErrorSpec rsvp = (RsvpErrorSpec) tlv; final ByteBuf body = Unpooled.buffer(); - if (rsvp.getErrorType().getImplementedInterface().equals(RsvpCase.class)) { + if (rsvp.getErrorType().implementedInterface().equals(RsvpCase.class)) { final RsvpCase r = (RsvpCase) rsvp.getErrorType(); serializeRsvp(r.getRsvpError(), body); TlvUtil.formatTlv(TYPE, body, buffer); diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/TestVendorInformationTlvParser.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/TestVendorInformationTlvParser.java index c7c85307ee..61c00d8318 100644 --- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/TestVendorInformationTlvParser.java +++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/TestVendorInformationTlvParser.java @@ -13,7 +13,6 @@ import org.opendaylight.protocol.pcep.parser.tlv.AbstractVendorInformationTlvPar import org.opendaylight.protocol.pcep.spi.PCEPDeserializerException; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.iana.rev130816.EnterpriseNumber; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.vendor.information.EnterpriseSpecificInformation; -import org.opendaylight.yangtools.yang.binding.DataContainer; public class TestVendorInformationTlvParser extends AbstractVendorInformationTlvParser { @@ -50,7 +49,7 @@ public class TestVendorInformationTlvParser extends AbstractVendorInformationTlv } @Override - public Class getImplementedInterface() { + public Class implementedInterface() { return TestEnterpriseSpecificInformation.class; } diff --git a/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing/AbstractSrSubobjectParser.java b/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing/AbstractSrSubobjectParser.java index dbb551f150..3abafc51ba 100644 --- a/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing/AbstractSrSubobjectParser.java +++ b/pcep/segment-routing/src/main/java/org/opendaylight/protocol/pcep/segment/routing/AbstractSrSubobjectParser.java @@ -30,7 +30,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.seg import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.segment.routing.rev181109.sr.subobject.nai.IpNodeIdBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.segment.routing.rev181109.sr.subobject.nai.UnnumberedAdjacency; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.segment.routing.rev181109.sr.subobject.nai.UnnumberedAdjacencyBuilder; -import org.opendaylight.yangtools.yang.binding.DataContainer; public abstract class AbstractSrSubobjectParser { @@ -61,7 +60,7 @@ public abstract class AbstractSrSubobjectParser { } @Override - public Class getImplementedInterface() { + public Class implementedInterface() { return SrSubobject.class; } diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/ObjectHeaderImpl.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/ObjectHeaderImpl.java index 237d297b3e..97a3711c2e 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/ObjectHeaderImpl.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/ObjectHeaderImpl.java @@ -8,7 +8,6 @@ package org.opendaylight.protocol.pcep.spi; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.ObjectHeader; -import org.opendaylight.yangtools.yang.binding.DataContainer; /** * Header parser for PCEP object. @@ -24,7 +23,7 @@ public class ObjectHeaderImpl implements ObjectHeader { } @Override - public Class getImplementedInterface() { + public Class implementedInterface() { return ObjectHeader.class; } diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/UnknownObject.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/UnknownObject.java index 5380d206dc..1edcd80772 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/UnknownObject.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/UnknownObject.java @@ -15,7 +15,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.typ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.pcep.error.object.ErrorObjectBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.pcerr.message.pcerr.message.Errors; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.pcerr.message.pcerr.message.ErrorsBuilder; -import org.opendaylight.yangtools.yang.binding.DataContainer; /** * Placeholder object. This object should be injected by in positions where an object is either completely unknown or @@ -52,7 +51,7 @@ public final class UnknownObject implements Object { } @Override - public Class getImplementedInterface() { + public Class implementedInterface() { return Object.class; } diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleEROSubobjectRegistry.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleEROSubobjectRegistry.java index a53ddaedef..bcd50e5742 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleEROSubobjectRegistry.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleEROSubobjectRegistry.java @@ -49,7 +49,7 @@ public final class SimpleEROSubobjectRegistry implements EROSubobjectRegistry { @Override public void serializeSubobject(final Subobject subobject, final ByteBuf buffer) { final EROSubobjectSerializer serializer = this.handlers.getSerializer( - subobject.getSubobjectType().getImplementedInterface()); + subobject.getSubobjectType().implementedInterface()); if (serializer == null) { return; } diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleLabelRegistry.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleLabelRegistry.java index 6c3cddbeaa..a047a4cef4 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleLabelRegistry.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleLabelRegistry.java @@ -46,7 +46,7 @@ public class SimpleLabelRegistry implements LabelRegistry { @Override public void serializeLabel(final boolean unidirectional, final boolean global, final LabelType label, final ByteBuf buffer) { - final LabelSerializer serializer = this.handlers.getSerializer(label.getImplementedInterface()); + final LabelSerializer serializer = this.handlers.getSerializer(label.implementedInterface()); if (serializer != null) { serializer.serializeLabel(unidirectional, global, label, buffer); } diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleMessageRegistry.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleMessageRegistry.java index 7b88906f65..13fbcc9c2e 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleMessageRegistry.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleMessageRegistry.java @@ -53,7 +53,7 @@ public final class SimpleMessageRegistry implements MessageRegistry { @Override public void serializeMessage(final Message message, final ByteBuf buffer) { - final MessageSerializer serializer = this.handlers.getSerializer(message.getImplementedInterface()); + final MessageSerializer serializer = this.handlers.getSerializer(message.implementedInterface()); if (serializer == null) { LOG.warn("PCEP serializer for message type {} is not registered.", message.getClass()); return; diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleObjectRegistry.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleObjectRegistry.java index 2dd5371ee6..918d219d9a 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleObjectRegistry.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleObjectRegistry.java @@ -81,7 +81,7 @@ public final class SimpleObjectRegistry implements ObjectRegistry { @Override public void serializeObject(final Object object, final ByteBuf buffer) { - final ObjectSerializer serializer = this.handlers.getSerializer(object.getImplementedInterface()); + final ObjectSerializer serializer = this.handlers.getSerializer(object.implementedInterface()); if (serializer == null) { return; } diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleRROSubobjectRegistry.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleRROSubobjectRegistry.java index b41d30fe34..6861980a8d 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleRROSubobjectRegistry.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleRROSubobjectRegistry.java @@ -45,7 +45,7 @@ public final class SimpleRROSubobjectRegistry implements RROSubobjectRegistry { @Override public void serializeSubobject(final Subobject subobject, final ByteBuf buffer) { final RROSubobjectSerializer serializer = this.handlers.getSerializer( - subobject.getSubobjectType().getImplementedInterface()); + subobject.getSubobjectType().implementedInterface()); if (serializer != null) { serializer.serializeSubobject(subobject, buffer); } diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleTlvRegistry.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleTlvRegistry.java index d37b8cb07d..c848ddd2cc 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleTlvRegistry.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleTlvRegistry.java @@ -45,7 +45,7 @@ public final class SimpleTlvRegistry implements TlvRegistry { @Override public void serializeTlv(final Tlv tlv, final ByteBuf buffer) { - final TlvSerializer serializer = this.handlers.getSerializer(tlv.getImplementedInterface()); + final TlvSerializer serializer = this.handlers.getSerializer(tlv.implementedInterface()); if (serializer == null) { return; } diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleVendorInformationObjectRegistry.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleVendorInformationObjectRegistry.java index db748962b3..35cfdaa07c 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleVendorInformationObjectRegistry.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleVendorInformationObjectRegistry.java @@ -56,7 +56,7 @@ public class SimpleVendorInformationObjectRegistry implements VendorInformationO @Override public void serializeVendorInformationObject(final VendorInformationObject viObject, final ByteBuf buffer) { final ObjectSerializer serializer = this.handlers.getSerializer( - viObject.getEnterpriseSpecificInformation().getImplementedInterface()); + viObject.getEnterpriseSpecificInformation().implementedInterface()); if (serializer == null) { return; } diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleVendorInformationTlvRegistry.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleVendorInformationTlvRegistry.java index fd7246fd38..46d2fde9b7 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleVendorInformationTlvRegistry.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleVendorInformationTlvRegistry.java @@ -48,7 +48,7 @@ public class SimpleVendorInformationTlvRegistry implements VendorInformationTlvR @Override public void serializeVendorInformationTlv(final VendorInformationTlv viTlv, final ByteBuf buffer) { final TlvSerializer serializer = this.handlers.getSerializer( - viTlv.getEnterpriseSpecificInformation().getImplementedInterface()); + viTlv.getEnterpriseSpecificInformation().implementedInterface()); if (serializer == null) { return; } diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleXROSubobjectRegistry.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleXROSubobjectRegistry.java index c06939f1fc..f435aa4cfc 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleXROSubobjectRegistry.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimpleXROSubobjectRegistry.java @@ -49,7 +49,7 @@ public final class SimpleXROSubobjectRegistry implements XROSubobjectRegistry { @Override public void serializeSubobject(final Subobject subobject, final ByteBuf buffer) { final XROSubobjectSerializer serializer = this.handlers.getSerializer( - subobject.getSubobjectType().getImplementedInterface()); + subobject.getSubobjectType().implementedInterface()); if (serializer == null) { return; } diff --git a/pcep/spi/src/test/java/org/opendaylight/protocol/pcep/spi/APITest.java b/pcep/spi/src/test/java/org/opendaylight/protocol/pcep/spi/APITest.java index a4f5d6e652..ac5958b5e8 100644 --- a/pcep/spi/src/test/java/org/opendaylight/protocol/pcep/spi/APITest.java +++ b/pcep/spi/src/test/java/org/opendaylight/protocol/pcep/spi/APITest.java @@ -51,7 +51,7 @@ public class APITest { final Object o = new CCloseBuilder().build(); UnknownObject unknown = new UnknownObject(PCEPErrors.LSP_RSVP_ERROR, o); - assertEquals(Object.class, unknown.getImplementedInterface()); + assertEquals(Object.class, unknown.implementedInterface()); assertEquals(o, unknown.getInvalidObject()); } } 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 53c49bc1b2..6c58fe9148 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 @@ -134,7 +134,7 @@ public class RegistryTest { doReturn(this.es).when(this.viTlv).getEnterpriseSpecificInformation(); - doReturn(EnterpriseSpecificInformation.class).when(this.es).getImplementedInterface(); + doReturn(EnterpriseSpecificInformation.class).when(this.es).implementedInterface(); } @Test diff --git a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java index 63ffa1e7ed..0345e7f7cb 100755 --- a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java +++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java @@ -62,7 +62,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev181109.pcep.client.attributes.path.computation.client.ReportedLspKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev181109.pcep.client.attributes.path.computation.client.reported.lsp.Path; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; -import org.opendaylight.yangtools.yang.binding.DataContainer; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -83,7 +82,7 @@ public abstract class AbstractTopologySessionListener implements TopologyS private final ProtocolVersion version = new ProtocolVersion((short) 1); @Override - public Class getImplementedInterface() { + public Class implementedInterface() { return MessageHeader.class; } diff --git a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/OperationResults.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/OperationResults.java index 9c63bfd920..6331c7fa54 100644 --- a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/OperationResults.java +++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/OperationResults.java @@ -21,7 +21,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev181109.OperationResult; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev181109.operation.result.Error; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.topology.pcep.rev181109.operation.result.ErrorBuilder; -import org.opendaylight.yangtools.yang.binding.DataContainer; final class OperationResults implements OperationResult { static final OperationResults NOACK = new OperationResults(FailureType.NoAck); @@ -78,7 +77,7 @@ final class OperationResults implements OperationResult { } @Override - public Class getImplementedInterface() { + public Class implementedInterface() { return OperationResult.class; } } diff --git a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyNodeState.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyNodeState.java index 837b4e66c5..d60b122d1b 100644 --- a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyNodeState.java +++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/TopologyNodeState.java @@ -59,7 +59,7 @@ final class TopologyNodeState implements AutoCloseable, TransactionChainListener Preconditions.checkArgument(holdStateNanos >= 0); this.nodeId = topology.child(Node.class, new NodeKey(id)); this.holdStateNanos = holdStateNanos; - this.chain = broker.createTransactionChain(this); + this.chain = broker.createMergingTransactionChain(this); } @Nonnull diff --git a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/session/stats/SessionStateImpl.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/session/stats/SessionStateImpl.java index fbd92982b1..725f34d3d2 100644 --- a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/session/stats/SessionStateImpl.java +++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/session/stats/SessionStateImpl.java @@ -37,7 +37,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.sta import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.stats.rev171113.reply.time.grouping.ReplyTimeBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.Message; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev181109.open.object.Open; -import org.opendaylight.yangtools.yang.binding.DataContainer; public final class SessionStateImpl implements PcepSessionState { private final LongAdder lastReceivedRptMsgTimestamp = new LongAdder(); @@ -179,7 +178,7 @@ public final class SessionStateImpl implements PcepSessionState { } @Override - public Class getImplementedInterface() { - return null; + public Class implementedInterface() { + return PcepSessionState.class; } } diff --git a/pcep/topology/topology-provider/src/main/resources/OSGI-INF/blueprint/pcep-topology.xml b/pcep/topology/topology-provider/src/main/resources/OSGI-INF/blueprint/pcep-topology.xml index 650b09f109..f6157fbe83 100644 --- a/pcep/topology/topology-provider/src/main/resources/OSGI-INF/blueprint/pcep-topology.xml +++ b/pcep/topology/topology-provider/src/main/resources/OSGI-INF/blueprint/pcep-topology.xml @@ -15,7 +15,7 @@ interface="org.opendaylight.bgpcep.pcep.topology.provider.TopologySessionListenerFactory"/> + odl:type="default"/> - \ No newline at end of file + diff --git a/pcep/topology/topology-stats/src/main/java/org/opendaylight/bgpcep/pcep/topology/stats/provider/TopologyStatsProviderImpl.java b/pcep/topology/topology-stats/src/main/java/org/opendaylight/bgpcep/pcep/topology/stats/provider/TopologyStatsProviderImpl.java index 672e431bf9..66149424b5 100644 --- a/pcep/topology/topology-stats/src/main/java/org/opendaylight/bgpcep/pcep/topology/stats/provider/TopologyStatsProviderImpl.java +++ b/pcep/topology/topology-stats/src/main/java/org/opendaylight/bgpcep/pcep/topology/stats/provider/TopologyStatsProviderImpl.java @@ -62,7 +62,7 @@ public final class TopologyStatsProviderImpl implements TransactionChainListener public synchronized void init() { LOG.info("Initializing TopologyStatsProvider service."); - this.transactionChain = this.dataBroker.createTransactionChain(this); + this.transactionChain = this.dataBroker.createMergingTransactionChain(this); final TimerTask task = new TimerTask() { @Override public void run() { @@ -127,7 +127,7 @@ public final class TopologyStatsProviderImpl implements TransactionChainListener if (!closed.get()) { transactionChain.close(); - transactionChain = dataBroker.createTransactionChain(this); + transactionChain = dataBroker.createMergingTransactionChain(this); } } diff --git a/pcep/topology/topology-stats/src/main/resources/OSGI-INF/blueprint/pcep-stats.xml b/pcep/topology/topology-stats/src/main/resources/OSGI-INF/blueprint/pcep-stats.xml index c832c46b8c..60758796ec 100644 --- a/pcep/topology/topology-stats/src/main/resources/OSGI-INF/blueprint/pcep-stats.xml +++ b/pcep/topology/topology-stats/src/main/resources/OSGI-INF/blueprint/pcep-stats.xml @@ -10,7 +10,7 @@ + odl:type="default"/> diff --git a/pcep/tunnel/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/CreateTunnelInstructionExecutor.java b/pcep/tunnel/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/CreateTunnelInstructionExecutor.java index 0b448d7ec9..ee8e415917 100644 --- a/pcep/tunnel/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/CreateTunnelInstructionExecutor.java +++ b/pcep/tunnel/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/CreateTunnelInstructionExecutor.java @@ -94,7 +94,7 @@ final class CreateTunnelInstructionExecutor extends AbstractInstructionExecutor final TerminationPointType dpt = dp1.getIgpTerminationPointAttributes().getTerminationPointType(); // The types have to match - Preconditions.checkArgument(spt.getImplementedInterface().equals(dpt.getImplementedInterface())); + Preconditions.checkArgument(spt.implementedInterface().equals(dpt.implementedInterface())); // And they have to actually be Ip final Ip sips = (Ip) spt; diff --git a/pcep/tunnel/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/NodeChangedListener.java b/pcep/tunnel/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/NodeChangedListener.java index 62170e9c5f..fd36634685 100644 --- a/pcep/tunnel/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/NodeChangedListener.java +++ b/pcep/tunnel/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/NodeChangedListener.java @@ -252,7 +252,7 @@ public final class NodeChangedListener implements ClusteredDataTreeChangeListene srcIp = new IpAddress(ipv6.getIpv6TunnelSenderAddress()); dstIp = new IpAddress(ipv6.getIpv6TunnelSenderAddress()); } else { - throw new IllegalArgumentException("Unsupported address family: " + af.getImplementedInterface()); + throw new IllegalArgumentException("Unsupported address family: " + af.implementedInterface()); } final Path path0 = value.getPath().get(0); diff --git a/pcep/tunnel/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunelProgrammingUtil.java b/pcep/tunnel/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunelProgrammingUtil.java index 8ed82fb6f2..d316af8be9 100644 --- a/pcep/tunnel/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunelProgrammingUtil.java +++ b/pcep/tunnel/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunelProgrammingUtil.java @@ -32,7 +32,6 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology. import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeKey; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.node.attributes.SupportingNode; -import org.opendaylight.yangtools.yang.binding.DataContainer; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,7 +39,7 @@ import org.slf4j.LoggerFactory; final class TunelProgrammingUtil { public static final ListenableFuture RESULT = Futures.immediateFuture(new OperationResult() { @Override - public Class getImplementedInterface() { + public Class implementedInterface() { return OperationResult.class; } diff --git a/pcep/tunnel/tunnel-provider/src/main/resources/OSGI-INF/blueprint/pcep-tunnel-provider.xml b/pcep/tunnel/tunnel-provider/src/main/resources/OSGI-INF/blueprint/pcep-tunnel-provider.xml index 284fe836a1..3e3d33780e 100644 --- a/pcep/tunnel/tunnel-provider/src/main/resources/OSGI-INF/blueprint/pcep-tunnel-provider.xml +++ b/pcep/tunnel/tunnel-provider/src/main/resources/OSGI-INF/blueprint/pcep-tunnel-provider.xml @@ -9,7 +9,7 @@ + odl:type="default"/> - \ No newline at end of file + 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 3115d57a6d..86852ba617 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 @@ -342,7 +342,7 @@ public class ProgrammingServiceImplTest extends AbstractProgrammingTest { final Optional deadline, final String... dependencyIds) { final SubmitInstructionInput mockedSubmitInstruction = mock(SubmitInstructionInput.class); - doReturn(PcepUpdateTunnelInput.class).when(mockedSubmitInstruction).getImplementedInterface(); + doReturn(PcepUpdateTunnelInput.class).when(mockedSubmitInstruction).implementedInterface(); final List dependencies = new ArrayList<>(); for (final String dependencyId : dependencyIds) { dependencies.add(new InstructionId(dependencyId)); diff --git a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleEROSubobjectRegistry.java b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleEROSubobjectRegistry.java index 10129b16c4..d701581114 100644 --- a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleEROSubobjectRegistry.java +++ b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleEROSubobjectRegistry.java @@ -49,7 +49,7 @@ public final class SimpleEROSubobjectRegistry implements EROSubobjectRegistry { @Override public void serializeSubobject(final SubobjectContainer subobject, final ByteBuf buffer) { final EROSubobjectSerializer serializer = this.handlers.getSerializer(subobject.getSubobjectType() - .getImplementedInterface()); + .implementedInterface()); if (serializer == null) { return; } diff --git a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleLabelRegistry.java b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleLabelRegistry.java index 308a7ea43b..644b1ee895 100644 --- a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleLabelRegistry.java +++ b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleLabelRegistry.java @@ -46,7 +46,7 @@ public final class SimpleLabelRegistry implements LabelRegistry { @Override public void serializeLabel(final boolean unidirectional, final boolean global, final LabelType label, final ByteBuf buffer) { - final LabelSerializer serializer = this.handlers.getSerializer(label.getImplementedInterface()); + final LabelSerializer serializer = this.handlers.getSerializer(label.implementedInterface()); if (serializer != null) { serializer.serializeLabel(unidirectional, global, label, buffer); } diff --git a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRROSubobjectRegistry.java b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRROSubobjectRegistry.java index 24c85c2c8c..52762121c9 100644 --- a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRROSubobjectRegistry.java +++ b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRROSubobjectRegistry.java @@ -48,7 +48,7 @@ public final class SimpleRROSubobjectRegistry implements RROSubobjectRegistry { @Override public void serializeSubobject(final SubobjectContainer subobject, final ByteBuf buffer) { final RROSubobjectSerializer serializer = this.handlers.getSerializer(subobject.getSubobjectType() - .getImplementedInterface()); + .implementedInterface()); if (serializer == null) { return; } diff --git a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRSVPObjectRegistry.java b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRSVPObjectRegistry.java index 1f8befeacf..7bd780861c 100644 --- a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRSVPObjectRegistry.java +++ b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleRSVPObjectRegistry.java @@ -52,7 +52,7 @@ public final class SimpleRSVPObjectRegistry implements RSVPTeObjectRegistry { if (parameter == null) { return; } - final RSVPTeObjectSerializer serializer = this.serializerHandler.get(parameter.getImplementedInterface()); + final RSVPTeObjectSerializer serializer = this.serializerHandler.get(parameter.implementedInterface()); if (serializer == null) { return; } diff --git a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleXROSubobjectRegistry.java b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleXROSubobjectRegistry.java index 9647d79e9a..495c89c927 100644 --- a/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleXROSubobjectRegistry.java +++ b/rsvp/spi/src/main/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleXROSubobjectRegistry.java @@ -49,7 +49,7 @@ public class SimpleXROSubobjectRegistry implements XROSubobjectRegistry { @Override public void serializeSubobject(final SubobjectContainer subobject, final ByteBuf buffer) { final XROSubobjectSerializer serializer = this.handlers.getSerializer(subobject.getSubobjectType() - .getImplementedInterface()); + .implementedInterface()); if (serializer == null) { return; } diff --git a/rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/ServiceLoaderRSVPExtensionProviderContextTest.java b/rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/ServiceLoaderRSVPExtensionProviderContextTest.java index d9becf854d..3a05815805 100644 --- a/rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/ServiceLoaderRSVPExtensionProviderContextTest.java +++ b/rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/ServiceLoaderRSVPExtensionProviderContextTest.java @@ -70,7 +70,7 @@ public class ServiceLoaderRSVPExtensionProviderContextTest { @Before public void setUp() throws RSVPParsingException { Mockito.doReturn(this.parsedRsvpTeObj).when(this.rsvpTeParser).parseObject(Mockito.any(ByteBuf.class)); - Mockito.doReturn(RsvpTeObject.class).when(this.parsedRsvpTeObj).getImplementedInterface(); + Mockito.doReturn(RsvpTeObject.class).when(this.parsedRsvpTeObj).implementedInterface(); Mockito.doReturn("parsedRsvpTeObj").when(this.parsedRsvpTeObj).toString(); Mockito.doNothing().when(this.rsvpTeSerializer).serializeObject(Mockito.any(RsvpTeObject.class), Mockito.any(ByteBuf.class)); @@ -79,7 +79,7 @@ public class ServiceLoaderRSVPExtensionProviderContextTest { Mockito.any(Boolean.class)); Mockito.doReturn(this.subObjType).when(this.subObj).getSubobjectType(); Mockito.doReturn("SubobjectContainer").when(this.subObj).toString(); - Mockito.doReturn(SubobjectType.class).when(this.subObjType).getImplementedInterface(); + Mockito.doReturn(SubobjectType.class).when(this.subObjType).implementedInterface(); Mockito.doNothing().when(this.xroObjSerializer).serializeSubobject(Mockito.any(SubobjectContainer.class), Mockito.any(ByteBuf.class)); @@ -87,7 +87,7 @@ public class ServiceLoaderRSVPExtensionProviderContextTest { Mockito.doReturn(this.rroSubObjType).when(this.rroSubObj).getSubobjectType(); Mockito.doReturn("SubobjectContainer").when(this.rroSubObj).toString(); Mockito.doReturn(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.record.route - .subobjects.SubobjectType.class).when(this.rroSubObjType).getImplementedInterface(); + .subobjects.SubobjectType.class).when(this.rroSubObjType).implementedInterface(); Mockito.doNothing().when(this.rroSerializer).serializeSubobject(Mockito.any(org.opendaylight.yang.gen.v1.urn .opendaylight.params.xml.ns.yang.rsvp.rev150820.record.route.subobjects.list.SubobjectContainer.class), Mockito.any(ByteBuf.class)); @@ -96,13 +96,13 @@ public class ServiceLoaderRSVPExtensionProviderContextTest { Mockito.any(Boolean.class)); Mockito.doReturn(this.subObjType).when(this.eroSubObj).getSubobjectType(); Mockito.doReturn("EROSubobjectContainer").when(this.eroSubObj).toString(); - Mockito.doReturn(SubobjectType.class).when(this.subObjType).getImplementedInterface(); + Mockito.doReturn(SubobjectType.class).when(this.subObjType).implementedInterface(); Mockito.doNothing().when(this.eroSerializer).serializeSubobject(Mockito.any(org.opendaylight.yang.gen.v1.urn .opendaylight.params.xml.ns.yang.rsvp.rev150820.explicit.route.subobjects.list.SubobjectContainer.class), Mockito.any(ByteBuf.class)); Mockito.doReturn(this.labelType).when(this.labelParser).parseLabel(Mockito.any(ByteBuf.class)); - Mockito.doReturn(LabelType.class).when(this.labelType).getImplementedInterface(); + Mockito.doReturn(LabelType.class).when(this.labelType).implementedInterface(); Mockito.doReturn("LabelType").when(this.labelType).toString(); Mockito.doNothing().when(this.labelSerializer).serializeLabel(Mockito.anyBoolean(), Mockito.anyBoolean(), Mockito.any(LabelType.class), Mockito.any(ByteBuf.class)); @@ -179,4 +179,4 @@ public class ServiceLoaderRSVPExtensionProviderContextTest { } } -} \ No newline at end of file +} diff --git a/rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleLabelRegistryTest.java b/rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleLabelRegistryTest.java index 29524767ee..cbb811f68e 100644 --- a/rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleLabelRegistryTest.java +++ b/rsvp/spi/src/test/java/org/opendaylight/protocol/rsvp/parser/spi/pojo/SimpleLabelRegistryTest.java @@ -25,7 +25,6 @@ import org.opendaylight.protocol.rsvp.parser.spi.LabelParser; import org.opendaylight.protocol.rsvp.parser.spi.LabelSerializer; import org.opendaylight.protocol.rsvp.parser.spi.RSVPParsingException; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.rsvp.rev150820.label.subobject.LabelType; -import org.opendaylight.yangtools.yang.binding.DataContainer; public class SimpleLabelRegistryTest { private final short ctype = 1; @@ -92,15 +91,15 @@ public class SimpleLabelRegistryTest { private final class MockLabelClass implements LabelType { @Override - public Class getImplementedInterface() { + public Class implementedInterface() { return MockLabelClass.class; } } private final class MockLabel implements LabelType { @Override - public Class getImplementedInterface() { + public Class implementedInterface() { return MockLabel.class; } } -} \ No newline at end of file +} -- 2.36.6