X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-remoterpc-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fremote%2Frpc%2Fmessages%2FExecuteRpc.java;h=d9f6a67b5f2ac7efcd53fab50d258ff8484b96ef;hb=refs%2Fheads%2Fmaster;hp=e32ef3dc0df6c5bae9ffd808d7c3fe2494437e7d;hpb=6a32d897d2dcb4fa54977b3b2defe76dc0a5d5e2;p=controller.git

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ExecuteRpc.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ExecuteRpc.java
index e32ef3dc0d..d9f6a67b5f 100644
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ExecuteRpc.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/ExecuteRpc.java
@@ -9,59 +9,37 @@ package org.opendaylight.controller.remote.rpc.messages;
 
 import static java.util.Objects.requireNonNull;
 
-import com.google.common.base.MoreObjects;
-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 org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.controller.cluster.datastore.node.utils.stream.SerializationUtils;
 import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
+import org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeDataInput;
+import org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeDataOutput;
+import org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeStreamVersion;
 
-public final class ExecuteRpc implements Serializable {
+public final class ExecuteRpc extends AbstractExecute<QName, @Nullable ContainerNode> {
     private static final long serialVersionUID = 1128904894827335676L;
 
-    @SuppressFBWarnings(value = "SE_BAD_FIELD", justification = "This field is not Serializable but this class "
-            + "implements writeReplace to delegate serialization to a Proxy class and thus instances of this class "
-            + "aren't serialized. FindBugs does not recognize this.")
-    private final NormalizedNode<?, ?> inputNormalizedNode;
-    private final QName rpc;
-
-    private ExecuteRpc(final @Nullable NormalizedNode<?, ?> inputNormalizedNode, final @NonNull QName rpc) {
-        this.rpc = requireNonNull(rpc, "rpc Qname should not be null");
-        this.inputNormalizedNode = inputNormalizedNode;
-    }
-
-    public static ExecuteRpc from(final @NonNull DOMRpcIdentifier rpc, final @Nullable NormalizedNode<?, ?> input) {
-        return new ExecuteRpc(input, rpc.getType().getLastComponent());
-    }
-
-    public @Nullable NormalizedNode<?, ?> getInputNormalizedNode() {
-        return inputNormalizedNode;
+    private ExecuteRpc(final @NonNull QName type, final @Nullable ContainerNode input) {
+        super(type, input);
     }
 
-    public @NonNull QName getRpc() {
-        return rpc;
-    }
-
-    private Object writeReplace() {
-        return new Proxy(this);
+    public static @NonNull ExecuteRpc from(final @NonNull DOMRpcIdentifier rpc,
+            final @Nullable ContainerNode input) {
+        return new ExecuteRpc(rpc.getType(), input);
     }
 
     @Override
-    public String toString() {
-        return MoreObjects.toStringHelper(this)
-                .add("rpc", rpc)
-                .add("normalizedNode", inputNormalizedNode)
-                .toString();
+    Object writeReplace() {
+        return new Proxy(this);
     }
 
-    private static class Proxy implements Externalizable {
+    private static final class Proxy implements Externalizable {
         private static final long serialVersionUID = 1L;
 
         private ExecuteRpc executeRpc;
@@ -70,23 +48,27 @@ public final class ExecuteRpc implements Serializable {
         // redundant. It is explicitly needed for Java serialization to be able to create instances via reflection.
         @SuppressWarnings("checkstyle:RedundantModifier")
         public Proxy() {
+
         }
 
         Proxy(final ExecuteRpc executeRpc) {
-            this.executeRpc = executeRpc;
+            this.executeRpc = requireNonNull(executeRpc);
         }
 
         @Override
         public void writeExternal(final ObjectOutput out) throws IOException {
-            // FIXME: QName is a WritableObject
-            out.writeObject(executeRpc.getRpc());
-            SerializationUtils.writeNormalizedNode(out, executeRpc.getInputNormalizedNode());
+            try (NormalizedNodeDataOutput stream = NormalizedNodeStreamVersion.current().newDataOutput(out)) {
+                stream.writeQName(executeRpc.getType());
+                stream.writeOptionalNormalizedNode(executeRpc.getInput());
+            }
         }
 
         @Override
-        public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException {
-            QName qname = (QName) in.readObject();
-            executeRpc = new ExecuteRpc(SerializationUtils.deserializeNormalizedNode(in), qname);
+        public void readExternal(final ObjectInput in) throws IOException {
+            final NormalizedNodeDataInput stream = NormalizedNodeDataInput.newDataInput(in);
+            final QName type = stream.readQName();
+            final ContainerNode input = RpcResponse.unmaskContainer(stream.readOptionalNormalizedNode());
+            executeRpc = new ExecuteRpc(type, input);
         }
 
         private Object readResolve() {