Enable spotbugs in mdsal-binding-dom-adapter

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

diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/ActionServiceAdapter.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/ActionServiceAdapter.java
index 04c74e630e620fc408025ae433c7dd207b212350..faa518171169d117cff812b0c7c6b995e9a6846b 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/ActionServiceAdapter.java
+++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/ActionServiceAdapter.java
@@ -12,15 +12,20 @@ import static com.google.common.base.Preconditions.checkState;
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.annotations.Beta;
+import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.FluentFuture;
 import java.lang.reflect.Proxy;
 import java.util.Set;
 import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.mdsal.binding.api.ActionService;
 import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
+import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMAdapterBuilder.Factory;
 import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections;
-import org.opendaylight.mdsal.dom.api.DOMOperationService;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.mdsal.dom.api.DOMActionService;
+import org.opendaylight.mdsal.dom.api.DOMService;
 import org.opendaylight.yangtools.concepts.Delegator;
 import org.opendaylight.yangtools.yang.binding.Action;
 import org.opendaylight.yangtools.yang.binding.DataObject;
@@ -31,12 +36,27 @@ import org.opendaylight.yangtools.yang.common.RpcResult;
 
 @Beta
 @NonNullByDefault
-final class ActionServiceAdapter
-        extends AbstractBindingLoadingAdapter<DOMOperationService, Class<? extends Action<?, ?, ?>>, ActionAdapter>
+// FIXME: make this class non-public once the controller user is gone
+public final class ActionServiceAdapter
+        extends AbstractBindingLoadingAdapter<DOMActionService, Class<? extends Action<?, ?, ?>>, ActionAdapter>
         implements ActionService {
+    private static final class Builder extends BindingDOMAdapterBuilder<ActionService> {
+        @Override
+        protected ActionService createInstance(final @Nullable BindingToNormalizedNodeCodec codec,
+                final ClassToInstanceMap<DOMService> delegates) {
+            final DOMActionService domAction = delegates.getInstance(DOMActionService.class);
+            return new ActionServiceAdapter(requireNonNull(codec), domAction);
+        }
+
+        @Override
+        public Set<? extends Class<? extends DOMService>> getRequiredDelegates() {
+            return ImmutableSet.of(DOMActionService.class);
+        }
+    }
+
     private static final class ConstrainedAction implements Delegator<Action<?, ?, ?>>,
-            Action<DataObject, RpcInput, RpcOutput> {
-        private final Action<DataObject, RpcInput, RpcOutput> delegate;
+            Action<InstanceIdentifier<?>, RpcInput, RpcOutput> {
+        private final Action<InstanceIdentifier<?>, RpcInput, RpcOutput> delegate;
         private final Set<? extends DataTreeIdentifier<?>> nodes;
 
         ConstrainedAction(final Action<?, ?, ?> delegate, final Set<? extends DataTreeIdentifier<?>> nodes) {
@@ -45,9 +65,9 @@ final class ActionServiceAdapter
         }
 
         @Override
-        public FluentFuture<RpcResult<RpcOutput>> invoke(final InstanceIdentifier<DataObject> path,
-                final RpcInput input) {
-            checkState(nodes.contains(path), "Cannot service %s", path);
+        public FluentFuture<RpcResult<RpcOutput>> invoke(final InstanceIdentifier<?> path, final RpcInput input) {
+            checkState(nodes.contains(DataTreeIdentifier.create(LogicalDatastoreType.OPERATIONAL, path)),
+                "Cannot service %s", path);
             return delegate.invoke(path, input);
         }
 
@@ -57,10 +77,18 @@ final class ActionServiceAdapter
         }
     }
 
-    ActionServiceAdapter(final BindingToNormalizedNodeCodec codec, final DOMOperationService delegate) {
+    static final Factory<ActionService> BUILDER_FACTORY = Builder::new;
+
+    ActionServiceAdapter(final BindingToNormalizedNodeCodec codec, final DOMActionService delegate) {
         super(codec, delegate);
     }
 
+    @Deprecated
+    public static ActionServiceAdapter create(final BindingToNormalizedNodeCodec codec,
+            final DOMActionService delegate) {
+        return new ActionServiceAdapter(codec, delegate);
+    }
+
     @Override
     public <O extends DataObject, T extends Action<?, ?, ?>> T getActionHandle(final Class<T> actionInterface,
             final Set<DataTreeIdentifier<O>> nodes) {