Split out OperationInvocation 65/107565/2
authorRobert Varga <robert.varga@pantheon.tech>
Tue, 29 Aug 2023 19:11:37 +0000 (21:11 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Tue, 29 Aug 2023 19:43:40 +0000 (21:43 +0200)
This should be a top-level class, even when it is a utility. Changes the
logger identity, but fixes a Sonar warning.

Change-Id: Id7777ac73b8e765df86349384f5f911f48562c00
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMRpcRouter.java
dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/OperationInvocation.java [new file with mode: 0644]
dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/GlobalDOMRpcRoutingTableEntryTest.java
dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/RoutedDOMRpcRoutingTableEntryTest.java
dom/mdsal-dom-broker/src/test/java/org/opendaylight/mdsal/dom/broker/UnknownDOMRpcRoutingTableEntryTest.java

index a0d1f1418d7ed74496c5de247cd1dafbd834462c..14bd9cf14183d6840d4e26cf8375f07ccd0f9fd6 100644 (file)
@@ -31,7 +31,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -71,8 +70,6 @@ import org.opendaylight.yangtools.concepts.Registration;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodes;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextListener;
 import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absolute;
@@ -550,87 +547,4 @@ public final class DOMRpcRouter extends AbstractRegistration
             };
         }
     }
-
-    static final class OperationInvocation {
-        private static final Logger LOG = LoggerFactory.getLogger(OperationInvocation.class);
-
-        static ListenableFuture<? extends DOMActionResult> invoke(final DOMActionRoutingTableEntry entry,
-                final Absolute type, final DOMDataTreeIdentifier path, final ContainerNode input) {
-            List<DOMActionImplementation> impls = entry.getImplementations(path);
-            if (impls == null) {
-                impls = entry.getImplementations(
-                    new DOMDataTreeIdentifier(path.getDatastoreType(), YangInstanceIdentifier.of()));
-                if (impls == null) {
-                    return Futures.immediateFailedFuture(new DOMActionNotAvailableException(
-                        "No implementation of Action %s available for %s", type, path));
-                }
-            }
-
-            return impls.get(0).invokeAction(type, path, input);
-        }
-
-        static ListenableFuture<? extends DOMRpcResult> invoke(final AbstractDOMRpcRoutingTableEntry entry,
-                final ContainerNode input) {
-            if (entry instanceof UnknownDOMRpcRoutingTableEntry) {
-                return Futures.immediateFailedFuture(
-                    new DOMRpcImplementationNotAvailableException("%s is not resolved to an RPC", entry.getType()));
-            } else if (entry instanceof RoutedDOMRpcRoutingTableEntry routed) {
-                return invokeRoutedRpc(routed, input);
-            } else if (entry instanceof GlobalDOMRpcRoutingTableEntry global) {
-                return invokeGlobalRpc(global, input);
-            }
-
-            return Futures.immediateFailedFuture(
-                new DOMRpcImplementationNotAvailableException("Unsupported RPC entry."));
-        }
-
-        private static ListenableFuture<? extends DOMRpcResult> invokeRoutedRpc(
-                final RoutedDOMRpcRoutingTableEntry entry, final ContainerNode input) {
-            final Optional<NormalizedNode> maybeKey = NormalizedNodes.findNode(input,
-                entry.getRpcId().getContextReference());
-
-            // Routing key is present, attempt to deliver as a routed RPC
-            if (maybeKey.isPresent()) {
-                final NormalizedNode key = maybeKey.orElseThrow();
-                final Object value = key.body();
-                if (value instanceof YangInstanceIdentifier iid) {
-                    // Find a DOMRpcImplementation for a specific iid
-                    final List<DOMRpcImplementation> specificImpls = entry.getImplementations(iid);
-                    if (specificImpls != null) {
-                        return specificImpls.get(0)
-                            .invokeRpc(DOMRpcIdentifier.create(entry.getType(), iid), input);
-                    }
-
-                    LOG.debug("No implementation for context {} found will now look for wildcard id", iid);
-
-                    // Find a DOMRpcImplementation for a wild card. Usually remote-rpc-connector would register an
-                    // implementation this way
-                    final List<DOMRpcImplementation> mayBeRemoteImpls =
-                        entry.getImplementations(YangInstanceIdentifier.of());
-
-                    if (mayBeRemoteImpls != null) {
-                        return mayBeRemoteImpls.get(0)
-                            .invokeRpc(DOMRpcIdentifier.create(entry.getType(), iid), input);
-                    }
-
-                } else {
-                    LOG.warn("Ignoring wrong context value {}", value);
-                }
-            }
-
-            final List<DOMRpcImplementation> impls = entry.getImplementations(null);
-            if (impls != null) {
-                return impls.get(0).invokeRpc(entry.getRpcId(), input);
-            }
-
-            return Futures.immediateFailedFuture(
-                new DOMRpcImplementationNotAvailableException("No implementation of RPC %s available",
-                    entry.getType()));
-        }
-
-        private static ListenableFuture<? extends DOMRpcResult> invokeGlobalRpc(
-                final GlobalDOMRpcRoutingTableEntry entry, final ContainerNode input) {
-            return entry.getImplementations(YangInstanceIdentifier.of()).get(0).invokeRpc(entry.getRpcId(), input);
-        }
-    }
 }
diff --git a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/OperationInvocation.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/OperationInvocation.java
new file mode 100644 (file)
index 0000000..1d19e69
--- /dev/null
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2023 PANTHEON.tech, s.r.o. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * 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.mdsal.dom.broker;
+
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import org.opendaylight.mdsal.dom.api.DOMActionNotAvailableException;
+import org.opendaylight.mdsal.dom.api.DOMActionResult;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
+import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier;
+import org.opendaylight.mdsal.dom.api.DOMRpcImplementationNotAvailableException;
+import org.opendaylight.mdsal.dom.api.DOMRpcResult;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
+import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodes;
+import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absolute;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+final class OperationInvocation {
+    private static final Logger LOG = LoggerFactory.getLogger(OperationInvocation.class);
+
+    private OperationInvocation() {
+        // hidden on purpose
+    }
+
+    static ListenableFuture<? extends DOMActionResult> invoke(final DOMActionRoutingTableEntry entry,
+            final Absolute type, final DOMDataTreeIdentifier path, final ContainerNode input) {
+        var impls = entry.getImplementations(path);
+        if (impls == null) {
+            impls = entry.getImplementations(
+                new DOMDataTreeIdentifier(path.getDatastoreType(), YangInstanceIdentifier.of()));
+            if (impls == null) {
+                return Futures.immediateFailedFuture(new DOMActionNotAvailableException(
+                    "No implementation of Action %s available for %s", type, path));
+            }
+        }
+
+        return impls.get(0).invokeAction(type, path, input);
+    }
+
+    static ListenableFuture<? extends DOMRpcResult> invoke(final AbstractDOMRpcRoutingTableEntry entry,
+            final ContainerNode input) {
+        if (entry instanceof UnknownDOMRpcRoutingTableEntry) {
+            return Futures.immediateFailedFuture(new DOMRpcImplementationNotAvailableException(
+                "%s is not resolved to an RPC", entry.getType()));
+        } else if (entry instanceof RoutedDOMRpcRoutingTableEntry routed) {
+            return invokeRoutedRpc(routed, input);
+        } else if (entry instanceof GlobalDOMRpcRoutingTableEntry global) {
+            return invokeGlobalRpc(global, input);
+        }
+
+        return Futures.immediateFailedFuture(new DOMRpcImplementationNotAvailableException("Unsupported RPC entry."));
+    }
+
+    private static ListenableFuture<? extends DOMRpcResult> invokeRoutedRpc(
+            final RoutedDOMRpcRoutingTableEntry entry, final ContainerNode input) {
+        final var maybeKey = NormalizedNodes.findNode(input, entry.getRpcId().getContextReference());
+
+        // Routing key is present, attempt to deliver as a routed RPC
+        if (maybeKey.isPresent()) {
+            final var key = maybeKey.orElseThrow();
+            final var value = key.body();
+            if (value instanceof YangInstanceIdentifier iid) {
+                // Find a DOMRpcImplementation for a specific iid
+                final var specificImpls = entry.getImplementations(iid);
+                if (specificImpls != null) {
+                    return specificImpls.get(0)
+                        .invokeRpc(DOMRpcIdentifier.create(entry.getType(), iid), input);
+                }
+
+                LOG.debug("No implementation for context {} found will now look for wildcard id", iid);
+
+                // Find a DOMRpcImplementation for a wild card. Usually remote-rpc-connector would register an
+                // implementation this way
+                final var mayBeRemoteImpls = entry.getImplementations(YangInstanceIdentifier.of());
+                if (mayBeRemoteImpls != null) {
+                    return mayBeRemoteImpls.get(0)
+                        .invokeRpc(DOMRpcIdentifier.create(entry.getType(), iid), input);
+                }
+
+            } else {
+                LOG.warn("Ignoring wrong context value {}", value);
+            }
+        }
+
+        final var impls = entry.getImplementations(null);
+        if (impls != null) {
+            return impls.get(0).invokeRpc(entry.getRpcId(), input);
+        }
+
+        return Futures.immediateFailedFuture(new DOMRpcImplementationNotAvailableException(
+            "No implementation of RPC %s available", entry.getType()));
+    }
+
+    private static ListenableFuture<? extends DOMRpcResult> invokeGlobalRpc(
+            final GlobalDOMRpcRoutingTableEntry entry, final ContainerNode input) {
+        return entry.getImplementations(YangInstanceIdentifier.of()).get(0).invokeRpc(entry.getRpcId(), input);
+    }
+}
\ No newline at end of file
index 250cdb9d2fdcfdaacac111a0734ddd0c749c4ee9..3774a66b81053d215039c4b1ae55fc40a59c5fec 100644 (file)
@@ -28,7 +28,6 @@ import java.util.concurrent.ExecutionException;
 import org.junit.Test;
 import org.opendaylight.mdsal.dom.api.DOMRpcImplementation;
 import org.opendaylight.mdsal.dom.api.DOMRpcImplementationNotAvailableException;
-import org.opendaylight.mdsal.dom.broker.DOMRpcRouter.OperationInvocation;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 
 public class GlobalDOMRpcRoutingTableEntryTest {
index 294581471d5515119a44019ed82a5d567406ea95..b749f82116d667c19bca18d3f5ed88ff53c16b86 100644 (file)
@@ -30,7 +30,6 @@ import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.mdsal.dom.api.DOMRpcImplementation;
 import org.opendaylight.mdsal.dom.api.DOMRpcImplementationNotAvailableException;
 import org.opendaylight.mdsal.dom.api.DOMRpcResult;
-import org.opendaylight.mdsal.dom.broker.DOMRpcRouter.OperationInvocation;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
index e4027f84062faaf56f7e448b1be1e50935dcc78b..d496b9e14623a07e9e1727496986e106896cd8a1 100644 (file)
@@ -19,7 +19,6 @@ import java.util.List;
 import java.util.Map;
 import org.junit.Test;
 import org.opendaylight.mdsal.dom.api.DOMRpcImplementation;
-import org.opendaylight.mdsal.dom.broker.DOMRpcRouter.OperationInvocation;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 
 public class UnknownDOMRpcRoutingTableEntryTest {