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%2FRpcResponse.java;h=f141f09b3ccb42aa2f1adedb7c2299abba0e82da;hb=refs%2Fchanges%2F20%2F89320%2F2;hp=e5cb488d97183beeaea3dba4d440d42b44f02b03;hpb=55d223f2e807077b5c876b8e3ef853628f9ca697;p=controller.git

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/RpcResponse.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/RpcResponse.java
index e5cb488d97..f141f09b3c 100644
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/RpcResponse.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/messages/RpcResponse.java
@@ -7,19 +7,53 @@
  */
 package org.opendaylight.controller.remote.rpc.messages;
 
-import java.io.Serializable;
-import org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.controller.cluster.datastore.node.utils.stream.SerializationUtils;
+import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 
-public class RpcResponse implements Serializable {
+public class RpcResponse extends AbstractResponse<NormalizedNode<?, ?>> {
     private static final long serialVersionUID = -4211279498688989245L;
 
-    private final NormalizedNodeMessages.Node resultNormalizedNode;
+    public RpcResponse(final @Nullable NormalizedNode<?, ?> output) {
+        super(output);
+    }
 
-    public RpcResponse(final NormalizedNodeMessages.Node inputNormalizedNode) {
-        resultNormalizedNode = inputNormalizedNode;
+    @Override
+    Object writeReplace() {
+        return new Proxy(this);
     }
 
-    public NormalizedNodeMessages.Node getResultNormalizedNode() {
-        return resultNormalizedNode;
+    private static class Proxy implements Externalizable {
+        private static final long serialVersionUID = 1L;
+
+        private RpcResponse rpcResponse;
+
+        // checkstyle flags the public modifier as redundant which really doesn't make sense since it clearly isn't
+        // redundant. It is explicitly needed for Java serialization to be able to create instances via reflection.
+        @SuppressWarnings("checkstyle:RedundantModifier")
+        public Proxy() {
+        }
+
+        Proxy(final RpcResponse rpcResponse) {
+            this.rpcResponse = rpcResponse;
+        }
+
+        @Override
+        public void writeExternal(final ObjectOutput out) throws IOException {
+            SerializationUtils.writeNormalizedNode(out, rpcResponse.getOutput());
+        }
+
+        @Override
+        public void readExternal(final ObjectInput in) throws IOException {
+            rpcResponse = new RpcResponse(SerializationUtils.readNormalizedNode(in).orElse(null));
+        }
+
+        private Object readResolve() {
+            return rpcResponse;
+        }
     }
 }