Bump upstreams

[mdsal.git] / dom / mdsal-dom-broker / src / main / java / org / opendaylight / mdsal / dom / broker / AbstractDOMRpcRoutingTableEntry.java

diff --git a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/AbstractDOMRpcRoutingTableEntry.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/AbstractDOMRpcRoutingTableEntry.java
index 9a5f47ffab91fad51f6b8cac20f6fb84f7eab9df..72bbc5e17d39da20bccb2a7177f7e23fab5c1c18 100644 (file)
--- a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/AbstractDOMRpcRoutingTableEntry.java
+++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/AbstractDOMRpcRoutingTableEntry.java
@@ -7,116 +7,45 @@
  */
 package org.opendaylight.mdsal.dom.broker;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableMap.Builder;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.collect.Maps;
-import com.google.common.util.concurrent.CheckedFuture;
-import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 import org.opendaylight.mdsal.dom.api.DOMRpcAvailabilityListener;
-import org.opendaylight.mdsal.dom.api.DOMRpcException;
+import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier;
 import org.opendaylight.mdsal.dom.api.DOMRpcImplementation;
-import org.opendaylight.mdsal.dom.api.DOMRpcResult;
+import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
-
-abstract class AbstractDOMRpcRoutingTableEntry {
-    private final Map<YangInstanceIdentifier, List<DOMRpcImplementation>> impls;
-    private final SchemaPath schemaPath;
 
-    AbstractDOMRpcRoutingTableEntry(final SchemaPath schemaPath, final Map<YangInstanceIdentifier,
-            List<DOMRpcImplementation>> impls) {
-        this.schemaPath = Preconditions.checkNotNull(schemaPath);
-        this.impls = Preconditions.checkNotNull(impls);
-    }
+abstract class AbstractDOMRpcRoutingTableEntry extends AbstractDOMRoutingTableEntry<YangInstanceIdentifier,
+        DOMRpcImplementation, DOMRpcAvailabilityListener, QName> {
+    private final DOMRpcIdentifier rpcId;
 
-    final SchemaPath getSchemaPath() {
-        return schemaPath;
+    AbstractDOMRpcRoutingTableEntry(final DOMRpcIdentifier rpcId,
+            final Map<YangInstanceIdentifier, List<DOMRpcImplementation>> implementations) {
+        super(rpcId.getType(), implementations);
+        this.rpcId = requireNonNull(rpcId);
     }
 
-    final List<DOMRpcImplementation> getImplementations(final YangInstanceIdentifier context) {
-        return impls.get(context);
-    }
-
-    final Map<YangInstanceIdentifier, List<DOMRpcImplementation>> getImplementations() {
-        return impls;
+    final DOMRpcIdentifier getRpcId() {
+        return rpcId;
     }
 
     final boolean containsContext(final YangInstanceIdentifier contextReference) {
-        return impls.containsKey(contextReference);
-    }
-
-    final Set<YangInstanceIdentifier> registeredIdentifiers(final DOMRpcAvailabilityListener listener) {
-        return Maps.filterValues(impls, list -> list.stream().anyMatch(listener::acceptsImplementation)).keySet();
+        return getImplementations().containsKey(contextReference);
     }
 
-    @VisibleForTesting
-    final Set<YangInstanceIdentifier> registeredIdentifiers() {
-        return impls.keySet();
+    @Override
+    protected final Set<YangInstanceIdentifier> registeredIdentifiers(final DOMRpcAvailabilityListener listener) {
+        return Maps.filterValues(getImplementations(), list -> list.stream()
+            .anyMatch(listener::acceptsImplementation)).keySet();
     }
 
-    /**
-     * This method adds the given DOMRpcImplementation instance for the given list RPC identifiers.
-     *
-     * @param implementation the DOMRpcImplementation instance to add
-     * @param newRpcs the List of new RPCs that the DOMRpcImplementation provides, must be mutable
-     * @return a new instance of AbstractDOMRpcRoutingTableEntry with the additions
-     */
-    final AbstractDOMRpcRoutingTableEntry add(
-            final DOMRpcImplementation implementation, final List<YangInstanceIdentifier> newRpcs) {
-        final Builder<YangInstanceIdentifier, List<DOMRpcImplementation>> vb = ImmutableMap.builder();
-        for (final Entry<YangInstanceIdentifier, List<DOMRpcImplementation>> ve : impls.entrySet()) {
-            if (newRpcs.remove(ve.getKey())) {
-                final List<DOMRpcImplementation> i = new ArrayList<>(ve.getValue().size() + 1);
-                i.addAll(ve.getValue());
-                i.add(implementation);
-
-                // New implementation is at the end, this will move it to be the last among implementations
-                // with equal cost -- relying on sort() being stable.
-                i.sort((i1, i2) -> Long.compare(i1.invocationCost(), i2.invocationCost()));
-                vb.put(ve.getKey(), i);
-            } else {
-                vb.put(ve);
-            }
-        }
-        for (final YangInstanceIdentifier ii : newRpcs) {
-            final List<DOMRpcImplementation> impl = new ArrayList<>(1);
-            impl.add(implementation);
-            vb.put(ii, impl);
-        }
-
-        return newInstance(vb.build());
+    @Override
+    protected Comparator<DOMRpcImplementation> implComparator() {
+        return Comparator.comparingLong(DOMRpcImplementation::invocationCost);
     }
-
-    final AbstractDOMRpcRoutingTableEntry remove(
-            final DOMRpcImplementation implementation, final List<YangInstanceIdentifier> removed) {
-        final Builder<YangInstanceIdentifier, List<DOMRpcImplementation>> vb = ImmutableMap.builder();
-        for (final Entry<YangInstanceIdentifier, List<DOMRpcImplementation>> ve : impls.entrySet()) {
-            if (removed.remove(ve.getKey())) {
-                final List<DOMRpcImplementation> i = new ArrayList<>(ve.getValue());
-                i.remove(implementation);
-                // We could trimToSize(), but that may perform another copy just to get rid
-                // of a single element. That is probably not worth the trouble.
-                if (!i.isEmpty()) {
-                    vb.put(ve.getKey(), i);
-                }
-            } else {
-                vb.put(ve);
-            }
-        }
-
-        final Map<YangInstanceIdentifier, List<DOMRpcImplementation>> v = vb.build();
-        return v.isEmpty() ? null : newInstance(v);
-    }
-
-    protected abstract CheckedFuture<DOMRpcResult, DOMRpcException> invokeRpc(NormalizedNode<?, ?> input);
-
-    protected abstract AbstractDOMRpcRoutingTableEntry newInstance(
-            Map<YangInstanceIdentifier, List<DOMRpcImplementation>> impls);
 }