X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=binding%2Fmdsal-binding-dom-adapter%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fbinding%2Fdom%2Fadapter%2FActionProviderServiceAdapter.java;h=a3ad6568c0eee1351db8701c92f71918d04094c9;hb=5f8a373c07549a901b70595067dd11c161d0c4e4;hp=a5e9e4bbd247499030c1f6f8dea25b80c0ab9188;hpb=191052b2c293127f62f39802da76151653cf369b;p=mdsal.git diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/ActionProviderServiceAdapter.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/ActionProviderServiceAdapter.java index a5e9e4bbd2..a3ad6568c0 100644 --- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/ActionProviderServiceAdapter.java +++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/ActionProviderServiceAdapter.java @@ -7,33 +7,43 @@ */ package org.opendaylight.mdsal.binding.dom.adapter; -import static com.google.common.base.Verify.verifyNotNull; import static java.util.Objects.requireNonNull; import com.google.common.collect.ClassToInstanceMap; import com.google.common.collect.ImmutableSet; +import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import java.util.List; import java.util.Set; +import java.util.stream.Collectors; import org.eclipse.jdt.annotation.NonNullByDefault; import org.opendaylight.mdsal.binding.api.ActionProviderService; +import org.opendaylight.mdsal.binding.api.ActionSpec; import org.opendaylight.mdsal.binding.api.DataTreeIdentifier; import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMAdapterBuilder.Factory; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.dom.api.DOMActionImplementation; +import org.opendaylight.mdsal.dom.api.DOMActionInstance; import org.opendaylight.mdsal.dom.api.DOMActionProviderService; import org.opendaylight.mdsal.dom.api.DOMActionResult; import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier; import org.opendaylight.mdsal.dom.api.DOMService; -import org.opendaylight.yangtools.concepts.AbstractObjectRegistration; -import org.opendaylight.yangtools.concepts.ObjectRegistration; +import org.opendaylight.mdsal.dom.spi.SimpleDOMActionResult; +import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.binding.Action; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.yang.common.ErrorTag; +import org.opendaylight.yangtools.yang.common.ErrorType; import org.opendaylight.yangtools.yang.common.RpcResult; +import org.opendaylight.yangtools.yang.common.RpcResultBuilder; import org.opendaylight.yangtools.yang.common.YangConstants; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; +import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absolute; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @NonNullByDefault public final class ActionProviderServiceAdapter extends AbstractBindingAdapter @@ -44,17 +54,19 @@ public final class ActionProviderServiceAdapter extends AbstractBindingAdapter delegates) { + protected ActionProviderService createInstance(final ClassToInstanceMap> delegates) { return new ActionProviderServiceAdapter(adapterContext(), delegates.getInstance(DOMActionProviderService.class)); } @Override - public Set> getRequiredDelegates() { + public Set>> getRequiredDelegates() { return ImmutableSet.of(DOMActionProviderService.class); } } + private static final Logger LOG = LoggerFactory.getLogger(ActionProviderServiceAdapter.class); + static final Factory BUILDER_FACTORY = Builder::new; ActionProviderServiceAdapter(final AdapterContext adapterContext, final DOMActionProviderService delegate) { @@ -62,44 +74,61 @@ public final class ActionProviderServiceAdapter extends AbstractBindingAdapter, T extends Action, S extends T> - ObjectRegistration registerImplementation(final Class actionInterface, final S implementation, - final LogicalDatastoreType datastore, final Set> validNodes) { - final SchemaPath path = currentSerializer().getActionPath(actionInterface); - final ObjectRegistration reg = getDelegate().registerActionImplementation( - new Impl(adapterContext(), - NodeIdentifier.create(YangConstants.operationOutputQName(path.getLastComponent().getModule())), - actionInterface, implementation), ImmutableSet.of()); - return new AbstractObjectRegistration<>(implementation) { - @Override - protected void removeRegistration() { - reg.close(); - } - }; + public

, ?, ?>> + Registration registerImplementation(final ActionSpec spec, final A implementation, + final LogicalDatastoreType datastore, final Set> validNodes) { + final CurrentAdapterSerializer serializer = currentSerializer(); + final Absolute actionPath = serializer.getActionPath(spec); + final Impl impl = new Impl(adapterContext(), actionPath, spec.type(), implementation); + final DOMActionInstance instance = validNodes.isEmpty() + // Register on the entire datastore + ? DOMActionInstance.of(actionPath, DOMDataTreeIdentifier.of(datastore, YangInstanceIdentifier.of())) + // Register on specific instances + : DOMActionInstance.of(actionPath, validNodes.stream() + .map(node -> serializer.toDOMDataTreeIdentifier(DataTreeIdentifier.of(datastore, node))) + .collect(Collectors.toUnmodifiableSet())); + + + return getDelegate().registerActionImplementation(impl, instance); } private static final class Impl implements DOMActionImplementation { private final Class> actionInterface; private final AdapterContext adapterContext; + @SuppressWarnings("rawtypes") private final Action implementation; private final NodeIdentifier outputName; - Impl(final AdapterContext adapterContext, final NodeIdentifier outputName, + Impl(final AdapterContext adapterContext, final Absolute actionPath, final Class> actionInterface, final Action implementation) { this.adapterContext = requireNonNull(adapterContext); - this.outputName = requireNonNull(outputName); + outputName = NodeIdentifier.create( + YangConstants.operationOutputQName(actionPath.lastNodeIdentifier().getModule())); this.actionInterface = requireNonNull(actionInterface); this.implementation = requireNonNull(implementation); } @Override @SuppressWarnings({ "rawtypes", "unchecked" }) - public ListenableFuture invokeAction(final SchemaPath type, + public ListenableFuture invokeAction(final Absolute type, final DOMDataTreeIdentifier path, final ContainerNode input) { final CurrentAdapterSerializer codec = adapterContext.currentSerializer(); + final InstanceIdentifier instance = codec.fromYangInstanceIdentifier(path.path()); + if (instance == null) { + // Not representable: return an error + LOG.debug("Path {} is not representable in binding, rejecting invocation", path); + return Futures.immediateFuture(new SimpleDOMActionResult(List.of(RpcResultBuilder.newError( + ErrorType.APPLICATION, ErrorTag.INVALID_VALUE, "Supplied path cannot be represented")))); + } + if (instance.isWildcarded()) { + // A wildcard path: return an error + LOG.debug("Path {} maps to a wildcard {}, rejecting invocation", path, instance); + return Futures.immediateFuture(new SimpleDOMActionResult(List.of(RpcResultBuilder.newError( + ErrorType.APPLICATION, ErrorTag.INVALID_VALUE, + "Supplied path does not identify a concrete instance")))); + } - final ListenableFuture> userFuture = implementation.invoke( - verifyNotNull(codec.fromYangInstanceIdentifier(path.getRootIdentifier())), + final ListenableFuture> userFuture = implementation.invoke(instance, codec.fromNormalizedNodeActionInput(actionInterface, input)); if (userFuture instanceof BindingOperationFluentFuture) { // If we are looping back through our future we can skip wrapping. This can happen if application