Merge changes I082f82ac,I951224b0,Icecd1b21,Ifafa74b6,I9b384c72, ...

[transportpce.git] / common / src / main / java / org / opendaylight / transportpce / common / network / NetworkTransactionService.java

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/network/NetworkTransactionService.java b/common/src/main/java/org/opendaylight/transportpce/common/network/NetworkTransactionService.java
index f06b969390def3e7073c39ff1b188b0b3e67eaf5..1b139d91ca0d0b80db90614d41f6f7e288764845 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/network/NetworkTransactionService.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/network/NetworkTransactionService.java
@@ -8,12 +8,13 @@
 
 package org.opendaylight.transportpce.common.network;
 
-import com.google.common.base.Optional;
 import com.google.common.util.concurrent.FluentFuture;
 import com.google.common.util.concurrent.ListenableFuture;
+import java.util.Optional;
 import org.eclipse.jdt.annotation.NonNull;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.common.api.CommitInfo;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
@@ -26,21 +27,15 @@ public interface NetworkTransactionService {
 
     void delete(LogicalDatastoreType store, InstanceIdentifier<?> path);
 
-    <T extends DataObject> void put(LogicalDatastoreType store, InstanceIdentifier<T> path, T data,
-                                    boolean createMissingParents);
-
-
     <T extends DataObject> void put(LogicalDatastoreType store, InstanceIdentifier<T> path,T data);
 
     <T extends DataObject> void merge(LogicalDatastoreType store, InstanceIdentifier<T> path, T data);
 
-    <T extends DataObject> void merge(LogicalDatastoreType store, InstanceIdentifier<T> path, T data,
-                                      boolean createMissingParents);
-
-    @Deprecated
-    ListenableFuture<Void> submit();
-
     FluentFuture<? extends @NonNull CommitInfo> commit();
 
-    void close();
+    /**
+     * the Databroker related to NetworkTransactionService.
+     * @return the Databroker related to NetworkTransactionService.
+     */
+    DataBroker getDataBroker();
 }