Move DataTreeListenerInfo

DataTreeListenerInfo is strictly JMX-related, hence it should not
be lurking among our messages. Move it to newly-established
cluster.mgmt.api package.

Strictly speaking this is not API-compatible, but previous location
was in implementation-specific place, so that should be fine.

JIRA: CONTROLLER-1965
Change-Id: Idd6771a93dffd62d43beea5a57985e372d9098a8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/DataTreeListenerInfo.java b/opendaylight/md-sal/cds-mgmt-api/src/main/java/org/opendaylight/controller/cluster/mgmt/api/DataTreeListenerInfo.java
similarity index 86%
rename from opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/DataTreeListenerInfo.java
rename to opendaylight/md-sal/cds-mgmt-api/src/main/java/org/opendaylight/controller/cluster/mgmt/api/DataTreeListenerInfo.java
index 5137b7c9a397c501bbbcc5361c9cb9a6f6f8e090..1a6a793cbbe089b385891053b48b884b2fc067e9 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/DataTreeListenerInfo.java
+++ b/opendaylight/md-sal/cds-mgmt-api/src/main/java/org/opendaylight/controller/cluster/mgmt/api/DataTreeListenerInfo.java
@@ -5,18 +5,20 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-package org.opendaylight.controller.cluster.datastore.messages;
+package org.opendaylight.controller.cluster.mgmt.api;

 
 import static java.util.Objects.requireNonNull;
 
 import javax.management.ConstructorParameters;
 
 import static java.util.Objects.requireNonNull;
 
 import javax.management.ConstructorParameters;

+import org.eclipse.jdt.annotation.NonNullByDefault;

 
 /**
 
 /**

- * Response to a {@link GetInfo} query from a data tree listener actor.
+ * Information about a registered listener.

  *
  * @author Thomas Pantelis
  */
  *
  * @author Thomas Pantelis
  */

-public class DataTreeListenerInfo {
+@NonNullByDefault
+public final class DataTreeListenerInfo {

     private final String listener;
     private final String registeredPath;
     private final boolean isEnabled;
     private final String listener;
     private final String registeredPath;
     private final boolean isEnabled;

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerActor.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerActor.java
index 5533fc8fad683756861305a45589115b422e4800..9a2afc9577d7c56bd07732a5a151bfd65cdc51b5 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerActor.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerActor.java
@@ -13,10 +13,10 @@ import akka.actor.Props;
 import org.opendaylight.controller.cluster.common.actor.AbstractUntypedActor;
 import org.opendaylight.controller.cluster.datastore.messages.DataTreeChanged;
 import org.opendaylight.controller.cluster.datastore.messages.DataTreeChangedReply;
 import org.opendaylight.controller.cluster.common.actor.AbstractUntypedActor;
 import org.opendaylight.controller.cluster.datastore.messages.DataTreeChanged;
 import org.opendaylight.controller.cluster.datastore.messages.DataTreeChangedReply;

-import org.opendaylight.controller.cluster.datastore.messages.DataTreeListenerInfo;

 import org.opendaylight.controller.cluster.datastore.messages.EnableNotification;
 import org.opendaylight.controller.cluster.datastore.messages.GetInfo;
 import org.opendaylight.controller.cluster.datastore.messages.OnInitialData;
 import org.opendaylight.controller.cluster.datastore.messages.EnableNotification;
 import org.opendaylight.controller.cluster.datastore.messages.GetInfo;
 import org.opendaylight.controller.cluster.datastore.messages.OnInitialData;

+import org.opendaylight.controller.cluster.mgmt.api.DataTreeListenerInfo;

 import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeListener;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 
 import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeListener;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeListenerInfoMXBeanImpl.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeListenerInfoMXBeanImpl.java
index 4b34397adc2deb93ac27398377f695977dd5f7fb..060c28ae1d44385b6e54dc21b60b4031f53233dd 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeListenerInfoMXBeanImpl.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeListenerInfoMXBeanImpl.java
@@ -24,9 +24,9 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 import org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard.ShardDataTreeListenerInfoMXBean;
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 import org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard.ShardDataTreeListenerInfoMXBean;

-import org.opendaylight.controller.cluster.datastore.messages.DataTreeListenerInfo;

 import org.opendaylight.controller.cluster.datastore.messages.GetInfo;
 import org.opendaylight.controller.cluster.datastore.messages.OnDemandShardState;
 import org.opendaylight.controller.cluster.datastore.messages.GetInfo;
 import org.opendaylight.controller.cluster.datastore.messages.OnDemandShardState;

+import org.opendaylight.controller.cluster.mgmt.api.DataTreeListenerInfo;

 import org.opendaylight.controller.md.sal.common.util.jmx.AbstractMXBean;
 import scala.concurrent.Await;
 import scala.concurrent.ExecutionContext;
 import org.opendaylight.controller.md.sal.common.util.jmx.AbstractMXBean;
 import scala.concurrent.Await;
 import scala.concurrent.ExecutionContext;

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardDataTreeListenerInfoMXBean.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardDataTreeListenerInfoMXBean.java
index 7954be0df7df375d2aced06a39d3cd86a91d3db1..15e1cfd26b4a1b6504d4de7c618111fcbfea5107 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardDataTreeListenerInfoMXBean.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardDataTreeListenerInfoMXBean.java
@@ -8,7 +8,7 @@
 package org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard;
 
 import java.util.List;
 package org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard;
 
 import java.util.List;

-import org.opendaylight.controller.cluster.datastore.messages.DataTreeListenerInfo;
+import org.opendaylight.controller.cluster.mgmt.api.DataTreeListenerInfo;

 
 /**
  * MXBean interface for reporting shard data tree change listener information.
 
 /**
  * MXBean interface for reporting shard data tree change listener information.

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/GetInfo.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/GetInfo.java
index 2026bd843fbbb5a6cb81e74a9ec11365e3a64d85..443574795d37be78213f4e974554af00ce2415d7 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/GetInfo.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/GetInfo.java
@@ -7,8 +7,10 @@
  */
 package org.opendaylight.controller.cluster.datastore.messages;
 
  */
 package org.opendaylight.controller.cluster.datastore.messages;
 

+import org.opendaylight.controller.cluster.mgmt.api.DataTreeListenerInfo;
+

 /**
 /**

- * Local message sent to an actor to retrieve internal information for reporting.
+ * Local message sent to an actor to retrieve {@link DataTreeListenerInfo} for reporting.

  *
  * @author Thomas Pantelis
  */
  *
  * @author Thomas Pantelis
  */