Merge "Fix warnings reported in toaster"

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

diff --git a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataProviderService.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataProviderService.java
index 1057c3039ea967045704a3770c38c61ecdd5fd8c..7d662cfcf20ebc60bd722fded3a6b04ab6eda9c7 100644 (file)
--- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataProviderService.java
+++ b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/data/DataProviderService.java
@@ -7,73 +7,31 @@
  */
 package org.opendaylight.controller.sal.binding.api.data;
 
-import java.util.Map;
-import java.util.Set;
 
-import org.opendaylight.controller.sal.common.DataStoreIdentifier;
+import org.opendaylight.controller.md.sal.common.api.data.DataProvisionService;
+import org.opendaylight.controller.md.sal.common.api.data.DataReader;
+import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
+import org.opendaylight.yangtools.concepts.Registration;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
-public interface DataProviderService extends DataBrokerService {
-
-    /**
-     * Adds {@link DataValidator} for specified Data Store
-     * 
-     * @param store
-     *            Data Store
-     * @param validator
-     *            Validator
-     */
-    @Deprecated
-    public void addValidator(DataStoreIdentifier store, DataValidator validator);
-
-    /**
-     * Removes {@link DataValidator} from specified Data Store
-     * 
-     * @param store
-     * @param validator
-     *            Validator
-     */
-    
-    @Deprecated
-    public void removeValidator(DataStoreIdentifier store, DataValidator validator);
-
-    /**
-     * Adds {@link DataCommitHandler} for specified data store
-     * 
-     * @param store
-     * @param provider
-     */
-    @Deprecated
-    void addCommitHandler(DataStoreIdentifier store, DataCommitHandler provider);
+/**
+ * DataProviderService is common access point for {@link BindingAwareProvider} providers
+ * to access data trees described by the YANG model.
+ *
+ */
+public interface DataProviderService extends DataBrokerService, DataProvisionService<InstanceIdentifier<? extends DataObject>, DataObject> {
 
-    /**
-     * Removes {@link DataCommitHandler} from specified data store
-     * 
-     * @param store
-     * @param provider
-     */
-    @Deprecated
-    void removeCommitHandler(DataStoreIdentifier store, DataCommitHandler provider);
 
     /**
-     * Adds {@link DataRefresher} for specified data store
-     * 
-     * @param store
-     * @param refresher
+     * Registers a data reader for particular subtree of overal YANG data tree.
+     *
+     * Registered data reader is called if anyone tries to read data from
+     * paths which are nested to provided path.
+     *
+     * @param path Subpath which is handled by registered data reader
+     * @param reader Instance of reader which
+     * @return Registration object for reader. Invoking {@link Registration#close()} will unregister reader.
      */
-    void addRefresher(DataStoreIdentifier store, DataRefresher refresher);
-
-    /**
-     * Removes {@link DataRefresher} from specified data store
-     * 
-     * @param store
-     * @param refresher
-     */
-    void removeRefresher(DataStoreIdentifier store, DataRefresher refresher);
-
-    public void registerCommitHandler(InstanceIdentifier path, DataCommitHandler commitHandler);
-    
-    public void registerValidator(InstanceIdentifier path, DataValidator validator);
-
+    Registration<DataReader<InstanceIdentifier<? extends DataObject>,DataObject>> registerDataReader(InstanceIdentifier<? extends DataObject> path,DataReader<InstanceIdentifier<? extends DataObject>,DataObject> reader);
 }