From 39c6a21093eb30c3d30372c08b5df8ac0deadd24 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 19 Feb 2021 07:07:23 +0100 Subject: [PATCH] Deprecate messagebus-netconf messagebus-netconf is not used by anyone and has a good number of deficiencies -- in its implementation as well as in the framework (from controller). Deprecate it for removal in the next release. JIRA: NETCONF-761 Change-Id: I852b23fc30362c4ae609f04da9145580d887eca9 Signed-off-by: Robert Varga --- netconf/messagebus-netconf/pom.xml | 2 -- .../netconf/ConnectionNotificationTopicRegistration.java | 1 + .../messagebus/eventsources/netconf/NetconfEventSource.java | 1 + .../eventsources/netconf/NetconfEventSourceManager.java | 1 + .../eventsources/netconf/NetconfEventSourceMount.java | 1 + .../eventsources/netconf/NetconfEventSourceRegistration.java | 1 + .../eventsources/netconf/NotificationTopicRegistration.java | 1 + .../netconf/StreamNotificationTopicRegistration.java | 1 + .../messagebus/eventsources/netconf/AbstractCodecTest.java | 1 + .../netconf/ConnectionNotificationTopicRegistrationTest.java | 1 + .../eventsources/netconf/NetconfEventSourceManagerTest.java | 2 +- .../eventsources/netconf/NetconfEventSourceMountTest.java | 1 + .../messagebus/eventsources/netconf/NetconfEventSourceTest.java | 1 + .../messagebus/eventsources/netconf/NetconfTestUtils.java | 1 + .../netconf/StreamNotificationTopicRegistrationTest.java | 1 + 15 files changed, 14 insertions(+), 3 deletions(-) diff --git a/netconf/messagebus-netconf/pom.xml b/netconf/messagebus-netconf/pom.xml index c420904ffd..0428d7ebbb 100644 --- a/netconf/messagebus-netconf/pom.xml +++ b/netconf/messagebus-netconf/pom.xml @@ -18,9 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html ../../parent - org.opendaylight.netconf messagebus-netconf - 1.10.0-SNAPSHOT ${project.artifactId} bundle diff --git a/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/ConnectionNotificationTopicRegistration.java b/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/ConnectionNotificationTopicRegistration.java index 3999aa2850..3cdd66052a 100644 --- a/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/ConnectionNotificationTopicRegistration.java +++ b/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/ConnectionNotificationTopicRegistration.java @@ -37,6 +37,7 @@ import org.w3c.dom.Element; /** * Topic registration on event-source-status-notification. */ +@Deprecated(forRemoval = true) class ConnectionNotificationTopicRegistration extends NotificationTopicRegistration { private static final Logger LOG = LoggerFactory.getLogger(ConnectionNotificationTopicRegistration.class); diff --git a/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSource.java b/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSource.java index 7f13c7a75b..72d27ff78f 100644 --- a/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSource.java +++ b/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSource.java @@ -69,6 +69,7 @@ import org.w3c.dom.Element; * NetconfEventSource serves as proxy between nodes and messagebus. Subscribers can join topic stream from this source. * Then they will receive notifications from device that matches pattern specified by topic. */ +@Deprecated(forRemoval = true) public class NetconfEventSource implements EventSource, DOMNotificationListener { private static final Logger LOG = LoggerFactory.getLogger(NetconfEventSource.class); diff --git a/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceManager.java b/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceManager.java index 6bad11f675..e9fcfc0980 100644 --- a/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceManager.java +++ b/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceManager.java @@ -39,6 +39,7 @@ import org.slf4j.LoggerFactory; * NetconfEventSourceManager implements DataChangeListener. On topology changes, it manages creation, * updating and removing registrations of event sources. */ +@Deprecated(forRemoval = true) public final class NetconfEventSourceManager implements DataTreeChangeListener, AutoCloseable { private static final Logger LOG = LoggerFactory.getLogger(NetconfEventSourceManager.class); diff --git a/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceMount.java b/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceMount.java index 28871bca6a..5f99d1e370 100644 --- a/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceMount.java +++ b/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceMount.java @@ -48,6 +48,7 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath; /** * Facade of mounted netconf device. */ +@Deprecated(forRemoval = true) class NetconfEventSourceMount { private static final YangInstanceIdentifier STREAMS_PATH = YangInstanceIdentifier.builder().node(Netconf.QNAME) .node(Streams.QNAME).build(); diff --git a/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceRegistration.java b/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceRegistration.java index dcb28acec0..ede15b0210 100644 --- a/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceRegistration.java +++ b/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceRegistration.java @@ -32,6 +32,7 @@ import org.slf4j.LoggerFactory; /** * Helper class to keep connection status of netconf node and event source registration object. */ +@Deprecated(forRemoval = true) final class NetconfEventSourceRegistration implements AutoCloseable { private static final Logger LOG = LoggerFactory.getLogger(NetconfEventSourceRegistration.class); diff --git a/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NotificationTopicRegistration.java b/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NotificationTopicRegistration.java index b3499a1ecb..286ac1db35 100644 --- a/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NotificationTopicRegistration.java +++ b/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NotificationTopicRegistration.java @@ -20,6 +20,7 @@ import org.slf4j.LoggerFactory; /** * Notification topic registration. */ +@Deprecated(forRemoval = true) abstract class NotificationTopicRegistration implements AutoCloseable { private static final Logger LOG = LoggerFactory.getLogger(NotificationTopicRegistration.class); diff --git a/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/StreamNotificationTopicRegistration.java b/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/StreamNotificationTopicRegistration.java index f2edf047af..d675217955 100644 --- a/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/StreamNotificationTopicRegistration.java +++ b/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/StreamNotificationTopicRegistration.java @@ -25,6 +25,7 @@ import org.slf4j.LoggerFactory; /** * Topic registration for notification with specified namespace from stream. */ +@Deprecated(forRemoval = true) class StreamNotificationTopicRegistration extends NotificationTopicRegistration { private static final Logger LOG = LoggerFactory.getLogger(StreamNotificationTopicRegistration.class); diff --git a/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/AbstractCodecTest.java b/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/AbstractCodecTest.java index 50d9805d85..caf6f5f37a 100644 --- a/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/AbstractCodecTest.java +++ b/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/AbstractCodecTest.java @@ -13,6 +13,7 @@ import org.opendaylight.mdsal.binding.dom.codec.impl.BindingCodecContext; import org.opendaylight.mdsal.binding.runtime.spi.BindingRuntimeHelpers; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netmod.notification.rev080714.Netconf; +@Deprecated(forRemoval = true) public abstract class AbstractCodecTest { static BindingCodecContext SERIALIZER; diff --git a/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/ConnectionNotificationTopicRegistrationTest.java b/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/ConnectionNotificationTopicRegistrationTest.java index c9d0f3ebdc..78b25847da 100644 --- a/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/ConnectionNotificationTopicRegistrationTest.java +++ b/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/ConnectionNotificationTopicRegistrationTest.java @@ -30,6 +30,7 @@ import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.messagebus.even import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; +@Deprecated(forRemoval = true) @RunWith(MockitoJUnitRunner.StrictStubs.class) public class ConnectionNotificationTopicRegistrationTest { diff --git a/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceManagerTest.java b/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceManagerTest.java index f61ea9baaa..df38c0904d 100644 --- a/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceManagerTest.java +++ b/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceManagerTest.java @@ -46,8 +46,8 @@ import org.opendaylight.yangtools.util.concurrent.FluentFutures; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; +@Deprecated(forRemoval = true) public class NetconfEventSourceManagerTest extends AbstractCodecTest { - private NetconfEventSourceManager netconfEventSourceManager; private ListenerRegistration listenerRegistrationMock; private DOMMountPointService domMountPointServiceMock; diff --git a/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceMountTest.java b/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceMountTest.java index a2d1adbcc1..ec06c223b4 100644 --- a/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceMountTest.java +++ b/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceMountTest.java @@ -45,6 +45,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.LeafNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; +@Deprecated(forRemoval = true) @RunWith(MockitoJUnitRunner.StrictStubs.class) public class NetconfEventSourceMountTest extends AbstractCodecTest { public static final String STREAM_1 = "stream-1"; diff --git a/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceTest.java b/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceTest.java index edf79ebb1f..7ddbd9ea7b 100644 --- a/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceTest.java +++ b/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceTest.java @@ -53,6 +53,7 @@ import org.opendaylight.yangtools.yang.model.api.NotificationDefinition; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absolute; +@Deprecated(forRemoval = true) @RunWith(MockitoJUnitRunner.StrictStubs.class) public class NetconfEventSourceTest { private static final Absolute NOTIFICATION_1_PATH = Absolute.of(QName.create("ns1", "1970-01-15", "not1")); diff --git a/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfTestUtils.java b/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfTestUtils.java index 748963293a..d6fcceab0d 100644 --- a/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfTestUtils.java +++ b/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfTestUtils.java @@ -44,6 +44,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNodeBuilder; +@Deprecated(forRemoval = true) public final class NetconfTestUtils { public static final String NOTIFICATION_CAPABILITY_PREFIX = "(urn:ietf:params:xml:ns:netconf:notification"; diff --git a/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/StreamNotificationTopicRegistrationTest.java b/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/StreamNotificationTopicRegistrationTest.java index d1123f7476..436245400a 100644 --- a/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/StreamNotificationTopicRegistrationTest.java +++ b/netconf/messagebus-netconf/src/test/java/org/opendaylight/netconf/messagebus/eventsources/netconf/StreamNotificationTopicRegistrationTest.java @@ -37,6 +37,7 @@ 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.NodeBuilder; import org.opendaylight.yangtools.concepts.ListenerRegistration; +@Deprecated(forRemoval = true) @RunWith(MockitoJUnitRunner.StrictStubs.class) public class StreamNotificationTopicRegistrationTest { -- 2.36.6