Simplify DOMOperation{Service,Implementation}

[mdsal.git] / dom / mdsal-dom-api / src / main / java / org / opendaylight / mdsal / dom / api / DOMOperationService.java

diff --git a/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMOperationService.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMOperationService.java
index 27d30b9f37ae5faa0f5385729299e36e50889199..33535b0b11134a884dea4bf0f35dc7cadaf4995f 100644 (file)
--- a/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMOperationService.java
+++ b/dom/mdsal-dom-api/src/main/java/org/opendaylight/mdsal/dom/api/DOMOperationService.java
@@ -7,12 +7,8 @@
  */
 package org.opendaylight.mdsal.dom.api;
 
-import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
-
 import com.google.common.annotations.Beta;
 import com.google.common.util.concurrent.FluentFuture;
-import com.google.common.util.concurrent.SettableFuture;
-import java.util.concurrent.Executor;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
@@ -29,18 +25,6 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 @Beta
 @NonNullByDefault
 public interface DOMOperationService extends DOMExtensibleService<DOMOperationService, DOMOperationServiceExtension> {
-    /**
-     * Initiate invocation of an RPC. This method is guaranteed to not block on any external resources.
-     *
-     * @param type QName of the RPC to be invoked
-     * @param input Input arguments
-     * @param callback Callback to invoke with the invocation result
-     * @param callbackExecutor Executor to use for executing the callback
-     * @throws NullPointerException if any of the arguments is null
-     */
-    void invokeRpc(QName type, ContainerNode input, DOMOperationCallback callback,
-            Executor callbackExecutor);
-
     /**
      * Initiate invocation of an RPC. This method is guaranteed to not block on any external resources.
      *
@@ -49,25 +33,7 @@ public interface DOMOperationService extends DOMExtensibleService<DOMOperationSe
      * @return A FluentFuture which completes with the result of invocation
      * @throws NullPointerException if any of the arguments is null
      */
-    default FluentFuture<DOMOperationResult> invokeRpc(final QName type, final ContainerNode input) {
-        final SettableFuture<DOMOperationResult> future = SettableFuture.create();
-        invokeRpc(type, input, DOMOperationCallback.completingFuture(future), directExecutor());
-        return future;
-    }
-
-    /**
-     * Initiate invocation of an Action. This method is guaranteed to not block on any external resources.
-     *
-     * @param type SchemaPath of the action to be invoked. This path refers to an effective action instantiated on top
-     *             of the conceptual {@link StoreTreeNode}.
-     * @param path {@link DOMDataTreeIdentifier} of parent data node which action attached to.
-     * @param input Input argument
-     * @param callback Callback to invoke with the invocation result
-     * @param callbackExecutor Executor to use for executing the callback
-     * @throws NullPointerException if any of the arguments is null
-     */
-    void invokeAction(SchemaPath type, DOMDataTreeIdentifier path, ContainerNode input, DOMOperationCallback callback,
-            Executor callbackExecutor);
+    FluentFuture<DOMOperationResult> invokeRpc(QName type, ContainerNode input);
 
     /**
      * Initiate invocation of an Action. This method is guaranteed to not block on any external resources.
@@ -79,10 +45,5 @@ public interface DOMOperationService extends DOMExtensibleService<DOMOperationSe
      * @return A FluentFuture which completes with the result of invocation
      * @throws NullPointerException if any of the arguments is null
      */
-    default FluentFuture<DOMOperationResult> invokeAction(final SchemaPath type, final DOMDataTreeIdentifier path,
-            final ContainerNode input) {
-        final SettableFuture<DOMOperationResult> future = SettableFuture.create();
-        invokeAction(type, path, input, DOMOperationCallback.completingFuture(future), directExecutor());
-        return future;
-    }
+    FluentFuture<DOMOperationResult> invokeAction(SchemaPath type, DOMDataTreeIdentifier path, ContainerNode input);
 }