From c98112b4851051a6d87afac43371a544fc0b3645 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 25 Jun 2021 14:16:11 +0200 Subject: [PATCH] Adjust to DOMDataTreeChangeListener update We are required to implement onInitialData() method, add it. Change-Id: I55e60c9013c49689252f662218db31152982019c Signed-off-by: Robert Varga --- .../entityownership/CandidateListChangeListener.java | 5 +++++ .../cluster/entityownership/EntityOwnerChangeListener.java | 5 +++++ .../cluster/entityownership/EntityOwnershipStatistics.java | 6 +++++- .../clustering/it/provider/impl/IdIntsListener.java | 6 +++++- 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/CandidateListChangeListener.java b/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/CandidateListChangeListener.java index 81ef3e7a32..d8df830d00 100644 --- a/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/CandidateListChangeListener.java +++ b/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/CandidateListChangeListener.java @@ -61,6 +61,11 @@ class CandidateListChangeListener implements DOMDataTreeChangeListener { .node(Candidate.QNAME).node(Candidate.QNAME).build(), this, Optional.empty(), noop -> { /* NOOP */ }); } + @Override + public void onInitialData() { + // No-op + } + @Override public void onDataTreeChanged(final Collection changes) { for (DataTreeCandidate change: changes) { diff --git a/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/EntityOwnerChangeListener.java b/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/EntityOwnerChangeListener.java index 509e53cc9f..974b5a150d 100644 --- a/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/EntityOwnerChangeListener.java +++ b/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/EntityOwnerChangeListener.java @@ -40,6 +40,11 @@ class EntityOwnerChangeListener extends AbstractEntityOwnerChangeListener { this.publisher = requireNonNull(publisher); } + @Override + public void onInitialData() { + // No-op + } + @Override public void onDataTreeChanged(final Collection changes) { for (DataTreeCandidate change: changes) { diff --git a/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/EntityOwnershipStatistics.java b/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/EntityOwnershipStatistics.java index 0f2a4ec82c..59cc7550c6 100644 --- a/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/EntityOwnershipStatistics.java +++ b/opendaylight/md-sal/sal-distributed-eos/src/main/java/org/opendaylight/controller/cluster/entityownership/EntityOwnershipStatistics.java @@ -28,13 +28,17 @@ import tech.pantheon.triemap.TrieMap; * finding out how many entities of a given type are owned by a given candidate is not an efficient query. */ class EntityOwnershipStatistics extends AbstractEntityOwnerChangeListener { - private final TrieMap> statistics = TrieMap.create(); EntityOwnershipStatistics() { // Hidden on purpose } + @Override + public void onInitialData() { + // No-op + } + @Override public void onDataTreeChanged(final Collection changes) { for (DataTreeCandidate change : changes) { diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/IdIntsListener.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/IdIntsListener.java index 72a8a02b5e..e905545649 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/IdIntsListener.java +++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/IdIntsListener.java @@ -32,7 +32,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class IdIntsListener implements ClusteredDOMDataTreeChangeListener { - private static final Logger LOG = LoggerFactory.getLogger(IdIntsListener.class); private static final long SECOND_AS_NANO = 1000000000; @@ -41,6 +40,11 @@ public class IdIntsListener implements ClusteredDOMDataTreeChangeListener { private ScheduledExecutorService executorService; private ScheduledFuture scheduledFuture; + @Override + public void onInitialData() { + // Intentional no-op + } + @Override public void onDataTreeChanged(final Collection changes) { -- 2.36.6