From 93d4005c45707a6ebbe4620a0be7d7402648a980 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 24 Jun 2021 13:58:11 +0200 Subject: [PATCH] DOMDataTreeChangeListener.onInitialData() is mandatory Hiding this method is ugly, make sure users are aware of it. JIRA: MDSAL-674 Change-Id: I9e733b46dea6251b43b3aa97d06e056fd7e8af16 Signed-off-by: Robert Varga --- .../mdsal/dom/api/DOMDataTreeChangeListener.java | 9 +-------- .../mdsal/dom/broker/DOMDataTreeListenerTest.java | 8 ++++++-- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMDataTreeChangeListener.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMDataTreeChangeListener.java index a6991110d8..da1f929265 100644 --- a/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMDataTreeChangeListener.java +++ b/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMDataTreeChangeListener.java @@ -44,13 +44,6 @@ public interface DOMDataTreeChangeListener extends EventListener { * Invoked only once during registration of the listener if there was no data in the conceptual data tree * for the supplied path, which was used to register this listener, and after this * {@link #onDataTreeChanged(Collection)} would always be invoked for data changes. - * - *

- * Default implementation does nothing and is appropriate for users who do not care about ascertaining - * initial stat. */ - // FIXME: 8.0.0: this method should be non-default - default void onInitialData() { - //no-op - } + void onInitialData(); } diff --git a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMDataTreeListenerTest.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMDataTreeListenerTest.java index 3d378ca5e3..f23c87022e 100644 --- a/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMDataTreeListenerTest.java +++ b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/DOMDataTreeListenerTest.java @@ -418,7 +418,6 @@ public class DOMDataTreeListenerTest extends AbstractDatastoreTest { } static class TestDataTreeListener implements DOMDataTreeChangeListener { - private final List> receivedChanges = new ArrayList<>(); private final CountDownLatch latch; @@ -432,7 +431,12 @@ public class DOMDataTreeListenerTest extends AbstractDatastoreTest { latch.countDown(); } - public List> getReceivedChanges() { + @Override + public void onInitialData() { + // noop + } + + List> getReceivedChanges() { return receivedChanges; } } -- 2.36.6