Reduce ObjectRegistration use

[mdsal.git] / binding / mdsal-binding-dom-adapter / src / main / java / org / opendaylight / mdsal / binding / dom / adapter / ActionProviderServiceAdapter.java

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 629948e037af635151b07cae4dd6c695f09821a3..a3ad6568c0eee1351db8701c92f71918d04094c9 100644 (file)
--- 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
@@ -29,12 +29,12 @@ import org.opendaylight.mdsal.dom.api.DOMActionResult;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
 import org.opendaylight.mdsal.dom.api.DOMService;
 import org.opendaylight.mdsal.dom.spi.SimpleDOMActionResult;
-import org.opendaylight.yangtools.concepts.AbstractObjectRegistration;
-import org.opendaylight.yangtools.concepts.ObjectRegistration;
+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.RpcError.ErrorType;
+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;
@@ -54,13 +54,13 @@ public final class ActionProviderServiceAdapter extends AbstractBindingAdapter<D
         }
 
         @Override
-        protected ActionProviderService createInstance(final ClassToInstanceMap<DOMService> delegates) {
+        protected ActionProviderService createInstance(final ClassToInstanceMap<DOMService<?, ?>> delegates) {
             return new ActionProviderServiceAdapter(adapterContext(),
                 delegates.getInstance(DOMActionProviderService.class));
         }
 
         @Override
-        public Set<? extends Class<? extends DOMService>> getRequiredDelegates() {
+        public Set<? extends Class<? extends DOMService<?, ?>>> getRequiredDelegates() {
             return ImmutableSet.of(DOMActionProviderService.class);
         }
     }
@@ -74,29 +74,22 @@ public final class ActionProviderServiceAdapter extends AbstractBindingAdapter<D
     }
 
     @Override
-    public <P extends DataObject, A extends Action<InstanceIdentifier<P>, ?, ?>, S extends A>
-            ObjectRegistration<S> registerImplementation(final ActionSpec<A, P> spec, final S implementation,
-                final LogicalDatastoreType datastore, final Set<InstanceIdentifier<P>> validNodes) {
+    public <P extends DataObject, A extends Action<? extends InstanceIdentifier<P>, ?, ?>>
+            Registration registerImplementation(final ActionSpec<A, P> spec, final A implementation,
+                final LogicalDatastoreType datastore, final Set<? extends InstanceIdentifier<P>> 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, new DOMDataTreeIdentifier(datastore, YangInstanceIdentifier.empty()))
+            ? DOMActionInstance.of(actionPath, DOMDataTreeIdentifier.of(datastore, YangInstanceIdentifier.of()))
                 // Register on specific instances
                 : DOMActionInstance.of(actionPath, validNodes.stream()
-                    .map(node -> serializer.toDOMDataTreeIdentifier(DataTreeIdentifier.create(datastore, node)))
+                    .map(node -> serializer.toDOMDataTreeIdentifier(DataTreeIdentifier.of(datastore, node)))
                     .collect(Collectors.toUnmodifiableSet()));
 
 
-        final ObjectRegistration<?> reg = getDelegate().registerActionImplementation(impl, instance);
-
-        return new AbstractObjectRegistration<>(implementation) {
-            @Override
-            protected void removeRegistration() {
-                reg.close();
-            }
-        };
+        return getDelegate().registerActionImplementation(impl, instance);
     }
 
     private static final class Impl implements DOMActionImplementation {
@@ -120,18 +113,19 @@ public final class ActionProviderServiceAdapter extends AbstractBindingAdapter<D
         public ListenableFuture<? extends DOMActionResult> invokeAction(final Absolute type,
                 final DOMDataTreeIdentifier path, final ContainerNode input) {
             final CurrentAdapterSerializer codec = adapterContext.currentSerializer();
-            final InstanceIdentifier<DataObject> instance = codec.fromYangInstanceIdentifier(path.getRootIdentifier());
+            final InstanceIdentifier<DataObject> 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, "invalid-value", "Supplied path cannot be represented"))));
+                    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, "invalid-value", "Supplied path does not identify a concrete instance"))));
+                    ErrorType.APPLICATION, ErrorTag.INVALID_VALUE,
+                    "Supplied path does not identify a concrete instance"))));
             }
 
             final ListenableFuture<RpcResult<?>> userFuture = implementation.invoke(instance,