X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-remoterpc-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fremote%2Frpc%2Fregistry%2FRoutingTable.java;h=8d67b3bdd311af7747657274d16717695de0eca1;hp=5159b96876d9e78bb4f2b85e08477b3ce842fb6a;hb=927bce5688e4b9d33d3e5e9b769d8a0dba5ccdd4;hpb=a2b838f96589b502578fa4e15cef2769f886a378

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/RoutingTable.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/RoutingTable.java
index 5159b96876..8d67b3bdd3 100644
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/RoutingTable.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/RoutingTable.java
@@ -10,33 +10,27 @@ package org.opendaylight.controller.remote.rpc.registry;
 import akka.actor.ActorRef;
 import akka.serialization.JavaSerializer;
 import akka.serialization.Serialization;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableSet;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.Externalizable;
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.Optional;
 import java.util.Set;
 import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeDataInput;
 import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeDataOutput;
 import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeInputOutput;
-import org.opendaylight.controller.remote.rpc.registry.gossip.BucketData;
 import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier;
 
-public final class RoutingTable implements BucketData<RoutingTable>, Serializable {
+public final class RoutingTable extends AbstractRoutingTable<RoutingTable, DOMRpcIdentifier> {
     private static final class Proxy implements Externalizable {
         private static final long serialVersionUID = 1L;
 
         @SuppressFBWarnings(value = "SE_BAD_FIELD", justification = "We deal with the field in serialization methods.")
         private Collection<DOMRpcIdentifier> rpcs;
-        private ActorRef rpcInvoker;
+        private ActorRef opsInvoker;
 
         // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to
         // be able to create instances via reflection.
@@ -46,13 +40,13 @@ public final class RoutingTable implements BucketData<RoutingTable>, Serializabl
         }
 
         Proxy(final RoutingTable table) {
-            rpcs = table.getRoutes();
-            rpcInvoker = table.getRpcInvoker();
+            rpcs = table.getItems();
+            opsInvoker = table.getInvoker();
         }
 
         @Override
         public void writeExternal(final ObjectOutput out) throws IOException {
-            out.writeObject(Serialization.serializedActorPath(rpcInvoker));
+            out.writeObject(Serialization.serializedActorPath(opsInvoker));
 
             final NormalizedNodeDataOutput nnout = NormalizedNodeInputOutput.newDataOutput(out);
             nnout.writeInt(rpcs.size());
@@ -64,7 +58,7 @@ public final class RoutingTable implements BucketData<RoutingTable>, Serializabl
 
         @Override
         public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException {
-            rpcInvoker = JavaSerializer.currentSystem().value().provider().resolveActorRef((String) in.readObject());
+            opsInvoker = JavaSerializer.currentSystem().value().provider().resolveActorRef((String) in.readObject());
 
             final NormalizedNodeDataInput nnin = NormalizedNodeInputOutput.newDataInput(in);
             final int size = nnin.readInt();
@@ -75,62 +69,30 @@ public final class RoutingTable implements BucketData<RoutingTable>, Serializabl
         }
 
         private Object readResolve() {
-            return new RoutingTable(rpcInvoker, rpcs);
+            return new RoutingTable(opsInvoker, rpcs);
         }
     }
 
     private static final long serialVersionUID = 1L;
 
-    @SuppressFBWarnings(value = "SE_BAD_FIELD", justification = "We deal with the field in serialization methods.")
-    private final Set<DOMRpcIdentifier> rpcs;
-    private final ActorRef rpcInvoker;
-
-    RoutingTable(final ActorRef rpcInvoker, final Collection<DOMRpcIdentifier> table) {
-        this.rpcInvoker = Preconditions.checkNotNull(rpcInvoker);
-        this.rpcs = ImmutableSet.copyOf(table);
-    }
-
-    @Override
-    public Optional<ActorRef> getWatchActor() {
-        return Optional.of(rpcInvoker);
-    }
-
-    public Set<DOMRpcIdentifier> getRoutes() {
-        return rpcs;
-    }
-
-    ActorRef getRpcInvoker() {
-        return rpcInvoker;
+    RoutingTable(final ActorRef invoker, final Collection<DOMRpcIdentifier> table) {
+        super(invoker, table);
     }
 
     RoutingTable addRpcs(final Collection<DOMRpcIdentifier> toAdd) {
-        final Set<DOMRpcIdentifier> newRpcs = new HashSet<>(rpcs);
+        final Set<DOMRpcIdentifier> newRpcs = new HashSet<>(getItems());
         newRpcs.addAll(toAdd);
-        return new RoutingTable(rpcInvoker, newRpcs);
+        return new RoutingTable(getInvoker(), newRpcs);
     }
 
     RoutingTable removeRpcs(final Collection<DOMRpcIdentifier> toRemove) {
-        final Set<DOMRpcIdentifier> newRpcs = new HashSet<>(rpcs);
+        final Set<DOMRpcIdentifier> newRpcs = new HashSet<>(getItems());
         newRpcs.removeAll(toRemove);
-        return new RoutingTable(rpcInvoker, newRpcs);
-    }
-
-    private Object writeReplace() {
-        return new Proxy(this);
-    }
-
-    @VisibleForTesting
-    boolean contains(final DOMRpcIdentifier routeId) {
-        return rpcs.contains(routeId);
-    }
-
-    @VisibleForTesting
-    int size() {
-        return rpcs.size();
+        return new RoutingTable(getInvoker(), newRpcs);
     }
 
     @Override
-    public String toString() {
-        return "RoutingTable{" + "rpcs=" + rpcs + ", rpcInvoker=" + rpcInvoker + '}';
+    Object writeReplace() {
+        return new Proxy(this);
     }
 }