Merge "- netconf SSH bridge bundle - Implement bridge using socket - standard netconf...

[controller.git] / opendaylight / md-sal / sal-common-api / src / main / java / org / opendaylight / controller / md / sal / common / api / data / DataModification.java

diff --git a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataModification.java b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataModification.java
index 1ab7c34589bec6cbed7ce375e3330c591add348b..d74b26dae24ae374aa5b03f987eea27c12fe7113 100644 (file)
--- a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataModification.java
+++ b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataModification.java
@@ -16,7 +16,7 @@ import org.opendaylight.controller.md.sal.common.api.TransactionStatus;
 // import org.opendaylight.yangtools.concepts.Path;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 
-public interface DataModification<P/* extends Path<P> */, D> extends DataReader<P, D> {
+public interface DataModification<P/* extends Path<P> */, D> extends DataChange<P, D>, DataReader<P, D> {
 
     /**
      * Returns transaction identifier
@@ -27,21 +27,31 @@ public interface DataModification<P/* extends Path<P> */, D> extends DataReader<
 
     TransactionStatus getStatus();
 
+    /**
+     * 
+     * @deprecated Use {@link #putOperationalData(Object, Object)} instead.
+     * 
+     * @param path
+     * @param data
+     */
+    @Deprecated
     void putRuntimeData(P path, D data);
 
+    void putOperationalData(P path, D data);
+
     void putConfigurationData(P path, D data);
 
+    /**
+     * @deprecated Use {@link #removeOperationalData(Object)}
+     * 
+     * @param path
+     */
+    @Deprecated
     void removeRuntimeData(P path);
 
-    void removeConfigurationData(P path);
-
-    public Map<P, D> getUpdatedConfigurationData();
+    void removeOperationalData(P path);
 
-    public Map<P, D> getUpdatedOperationalData();
-
-    public Set<P> getRemovedConfigurationData();
-
-    public Set<P> getRemovedOperationalData();
+    void removeConfigurationData(P path);
 
     /**
      * Initiates a two-phase commit of modification.