Bump MRI upstreams

[netconf.git] / netconf / sal-netconf-connector / src / main / java / org / opendaylight / netconf / sal / connect / netconf / DeviceActionFactoryImpl.java

diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/DeviceActionFactoryImpl.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/DeviceActionFactoryImpl.java
index a15b00a6ecb472439c77ee77f4fb988d4eed030b..6f48d89bde4364670248ca037e658da74e702dff 100644 (file)
--- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/DeviceActionFactoryImpl.java
+++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/DeviceActionFactoryImpl.java
@@ -5,27 +5,22 @@
  * 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.netconf.sal.connect.netconf;
 
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ClassToInstanceMap;
-import com.google.common.collect.ImmutableClassToInstanceMap;
-import com.google.common.util.concurrent.FluentFuture;
+import static java.util.Objects.requireNonNull;
+
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
-import org.eclipse.jdt.annotation.NonNull;
-import org.opendaylight.mdsal.dom.api.DOMActionResult;
+import javax.inject.Singleton;
 import org.opendaylight.mdsal.dom.api.DOMActionService;
-import org.opendaylight.mdsal.dom.api.DOMActionServiceExtension;
-import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
 import org.opendaylight.netconf.api.NetconfMessage;
 import org.opendaylight.netconf.sal.connect.api.DeviceActionFactory;
 import org.opendaylight.netconf.sal.connect.api.MessageTransformer;
 import org.opendaylight.netconf.sal.connect.api.RemoteDeviceCommunicator;
 import org.opendaylight.yangtools.yang.common.RpcResult;
-import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.osgi.service.component.annotations.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -35,40 +30,32 @@ import org.slf4j.LoggerFactory;
  * transforms replied NETCONF message  to action result, and using {@link RemoteDeviceCommunicator} that is responsible
  * for sending of built RPCs to NETCONF client.
  */
+@Singleton
+@Component(immediate = true, property = "type=default")
 public class DeviceActionFactoryImpl implements DeviceActionFactory {
-
     private static final Logger LOG = LoggerFactory.getLogger(DeviceActionFactoryImpl.class);
 
     @Override
     public DOMActionService createDeviceAction(final MessageTransformer<NetconfMessage> messageTransformer,
             final RemoteDeviceCommunicator<NetconfMessage> listener, final SchemaContext schemaContext) {
-
-        return new DOMActionService() {
-            @Override
-            public FluentFuture<? extends DOMActionResult> invokeAction(final SchemaPath schemaPath,
-                    final DOMDataTreeIdentifier dataTreeIdentifier, final ContainerNode input) {
-                Preconditions.checkNotNull(schemaPath);
-                Preconditions.checkNotNull(dataTreeIdentifier);
-                Preconditions.checkNotNull(input);
-
-                final FluentFuture<RpcResult<NetconfMessage>> actionResultFuture = listener.sendRequest(
-                        messageTransformer.toActionRequest(schemaPath, dataTreeIdentifier, input), input.getNodeType());
-
-                return actionResultFuture.transform(netconfMessageRpcResult -> {
-                    if (netconfMessageRpcResult != null) {
-                        return messageTransformer.toActionResult(schemaPath, netconfMessageRpcResult.getResult());
-                    } else {
-                        final String message = "Missing action result of action on schema path: " + schemaPath;
-                        LOG.error(message);
-                        throw new IllegalStateException(message);
-                    }
-                }, MoreExecutors.directExecutor());
-            }
-
-            @Override
-            public @NonNull ClassToInstanceMap<DOMActionServiceExtension> getExtensions() {
-                return ImmutableClassToInstanceMap.of();
-            }
+        return (schemaPath, dataTreeIdentifier, input) -> {
+            requireNonNull(schemaPath);
+            requireNonNull(dataTreeIdentifier);
+            requireNonNull(input);
+
+            final ListenableFuture<RpcResult<NetconfMessage>> actionResultFuture = listener.sendRequest(
+                messageTransformer.toActionRequest(schemaPath, dataTreeIdentifier, input),
+                input.getIdentifier().getNodeType());
+
+            return Futures.transform(actionResultFuture, netconfMessageRpcResult -> {
+                if (netconfMessageRpcResult != null) {
+                    return messageTransformer.toActionResult(schemaPath, netconfMessageRpcResult.getResult());
+                }
+
+                final String message = "Missing action result of action on schema path: " + schemaPath;
+                LOG.error(message);
+                throw new IllegalStateException(message);
+            }, MoreExecutors.directExecutor());
         };
     }
-}
\ No newline at end of file
+}